diff --git a/Changelog.md b/Changelog.md
index e01f667719386eedf23ef13658241d2bcc2e10bd..db4c73da8a0edfa2605acf90b1c040f0811dd1b6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,45 @@
+## %"FusionDirectory 1.2.2" - 2018-08-16
+
+### Added
+
+#### fusiondirectory-plugins
+- fd-plugins#5821 Add LUKS section to FAI disk entry
+
+### Changed
+
+#### fusiondirectory-plugins
+- fd-plugins#5836 random_int should be used instead of mt_rand
+- fd-plugins#5840 Duplicated value in affiliation file
+
+### Fixed
+
+#### fusiondirectory
+- fd#5730 PHP error when I deactivate "opsi client" tab on a workstation
+- fd#5789 LDIF import can trigger PHP errors on empty file
+- fd#5816 Blacklist is not reset correctly for UserAttribute
+- fd#5824 LDIF generation does not respect STARTTLS setting
+- fd#5846 Samba groups are not showing in dashboard
+- fd#5850 Config insertion LDAP errors from setup are not shown
+- fd#5851 Creating a user from a template with a non-existing group crashes
+- fd#5864 Name field for countries should be limited to two characters
+- fd#5868 HTML is not escaped in departments descriptions
+
+#### fusiondirectory-plugins
+- fd-plugins#5719 Locale issues in the fai plugin
+- fd-plugins#5741 Reference tab on the OPSI profile is not showing objects reference
+- fd-plugins#5810 WebService should not return session cookie
+- fd-plugins#5827 Fatal error in opsiProfile when OPSI server is not found in the LDAP
+- fd-plugins#5828 supannCodeEntite should allow uppercase as well
+- fd-plugins#5832 Copy/pasting of Samba groups fails
+- fd-plugins#5833 Error in supann tab when we use a template
+
+### Security
+
+#### fusiondirectory
+- fd#5840 Security Vulnerability: Cross Site Request Forgery
+- fd#5842 Security: Missing Security Headers
+- fd#5843 Security: Insecure Generation of Random Tokens
+
 ## %"FusionDirectory 1.2.1" - 2018-05-09
 
 ### Added
diff --git a/alias/locale/af_ZA/fusiondirectory.po b/alias/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..0518adef057df0e887af37347bfaae94f6856b46
--- /dev/null
+++ b/alias/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,148 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/alias/class_mailAliasDistribution.inc:31
+#: admin/alias/class_mailAliasDistribution.inc:32
+#: admin/alias/class_mailAliasDistribution.inc:35
+msgid "Temporary mail distribution"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:51
+msgid "Mail distribution"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:54
+#: admin/alias/class_mailAliasRedirection.inc:55
+msgid "Name"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:54
+msgid "Name to identify this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:57
+msgid "Description"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Description of this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:60
+msgid "Email address"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:65
+msgid "Email aliases"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:65
+msgid "Aliases for this email address"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:70
+msgid "Mail server"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:70
+msgid "Mail server for this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:75
+#: admin/alias/class_mailAliasRedirection.inc:73
+msgid "Expiration date"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:75
+msgid ""
+"Date after which the alias should be deleted. Leave empty for no deletion."
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:31
+#: admin/alias/class_mailAliasRedirection.inc:32
+#: admin/alias/class_mailAliasRedirection.inc:35
+msgid "Temporary mail redirection"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:52
+msgid "Mail redirection"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:55
+msgid "Name to identify this redirection"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:57
+msgid "Description of this redirection"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:62
+msgid "Redirect from"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:62
+msgid "Mail address from which you want to redirect"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:68
+msgid "Redirect to"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:68
+msgid "Destination of this redirection"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:73
+msgid ""
+"Date after which the redirection should be deleted. Leave empty for no "
+"deletion."
+msgstr ""
+
+#: admin/alias/class_aliasManagement.inc:33
+msgid "Aliases"
+msgstr ""
+
+#: admin/alias/class_aliasManagement.inc:34
+msgid "Alias management"
+msgstr ""
+
+#: admin/alias/class_aliasManagement.inc:38
+msgid "Mail aliases"
+msgstr ""
+
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
+msgstr ""
+
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
+msgstr ""
+
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
+msgstr ""
+
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
+msgstr ""
+
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
+msgstr ""
diff --git a/alias/locale/ar/fusiondirectory.po b/alias/locale/ar/fusiondirectory.po
index 8e484ceea4bc63473d41698104ceba82946f8ffd..e840f77ab46fe9bb7a2d7bf68fd49144bd2daf43 100644
--- a/alias/locale/ar/fusiondirectory.po
+++ b/alias/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/alias/locale/ca/fusiondirectory.po b/alias/locale/ca/fusiondirectory.po
index df4f9b63f1bb0ce467a9f8ff3f1e902c291bca6d..7f7538072a67d6860eff45b7601a8129dc439db5 100644
--- a/alias/locale/ca/fusiondirectory.po
+++ b/alias/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/alias/locale/cs_CZ/fusiondirectory.po b/alias/locale/cs_CZ/fusiondirectory.po
index ee8d0ab3844ee7f5272603dcfb48e0d43ccc5ddd..f6122cce6cd89af067cc1a04fc5f4a35c528b6d8 100644
--- a/alias/locale/cs_CZ/fusiondirectory.po
+++ b/alias/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/alias/class_mailAliasDistribution.inc:31
 #: admin/alias/class_mailAliasDistribution.inc:32
diff --git a/alias/locale/de/fusiondirectory.po b/alias/locale/de/fusiondirectory.po
index fb285fe8edd0826dc58d8fce0bba9d686e4d58d4..5050e1e2a2019414ecab1d7dcf6a4d3b4d6ae098 100644
--- a/alias/locale/de/fusiondirectory.po
+++ b/alias/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/alias/locale/el_GR/fusiondirectory.po b/alias/locale/el_GR/fusiondirectory.po
index 9652b9ab74ce8c0dddbec47503f564f9813bd6f9..96ab3d40ca9b59d92b685a2eafa3bf75b36f7874 100644
--- a/alias/locale/el_GR/fusiondirectory.po
+++ b/alias/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/alias/locale/es/fusiondirectory.po b/alias/locale/es/fusiondirectory.po
index bb0d13b4d34445ebd879fa5eb3f245a4d8b6aaa6..606d4d901f9880e4110318293def45819e22732a 100644
--- a/alias/locale/es/fusiondirectory.po
+++ b/alias/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/alias/locale/es_CO/fusiondirectory.po b/alias/locale/es_CO/fusiondirectory.po
index 4d2a76b83fa1a185174053969b8fcb7806a02995..152ca37938d077889f7de63690bfc6b0c045c5ab 100644
--- a/alias/locale/es_CO/fusiondirectory.po
+++ b/alias/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/alias/locale/es_VE/fusiondirectory.po b/alias/locale/es_VE/fusiondirectory.po
index d9f1cedd680968807c6282e93758622f1b7d1127..fab30ae1af5dec9c18875a6bd214a3faa79b80f7 100644
--- a/alias/locale/es_VE/fusiondirectory.po
+++ b/alias/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/alias/locale/fa_IR/fusiondirectory.po b/alias/locale/fa_IR/fusiondirectory.po
index 048d167674a8b45d72b0339b463534d67c395c09..537e61aad8a653ab8f59290a4064eecfb4a72bc0 100644
--- a/alias/locale/fa_IR/fusiondirectory.po
+++ b/alias/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/alias/class_mailAliasDistribution.inc:31
 #: admin/alias/class_mailAliasDistribution.inc:32
diff --git a/alias/locale/fi_FI/fusiondirectory.po b/alias/locale/fi_FI/fusiondirectory.po
index fcbb06db9c02b9b695a4cfec54921b372a0ce171..a3c2bc3ebae664db8cab6c788e0b0377be7b9e9c 100644
--- a/alias/locale/fi_FI/fusiondirectory.po
+++ b/alias/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/alias/locale/fr/fusiondirectory.po b/alias/locale/fr/fusiondirectory.po
index da777803778e50fa9556fb2c9e6c3f3b3e9d1a85..6e56ff66b92bf2f19b59f33bed8204083b06757e 100644
--- a/alias/locale/fr/fusiondirectory.po
+++ b/alias/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/alias/locale/hu_HU/fusiondirectory.po b/alias/locale/hu_HU/fusiondirectory.po
index 6074ccb6a70048df4b2881502a9c42d582413c40..7c95c3c66698db382f84c4c1dcccd8b9ce1045d0 100644
--- a/alias/locale/hu_HU/fusiondirectory.po
+++ b/alias/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/alias/locale/id/fusiondirectory.po b/alias/locale/id/fusiondirectory.po
index bb8b4e00d8006570cc5c838d64d52943e9a9fec2..1613a7d508876e8be601f449626a6c1e93e8a8ea 100644
--- a/alias/locale/id/fusiondirectory.po
+++ b/alias/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/alias/locale/it_IT/fusiondirectory.po b/alias/locale/it_IT/fusiondirectory.po
index 065e47dcd39f146a3db5f2545321f43a034989a7..a168e78b3a2db683f4e1dc98a27a86534ae9f146 100644
--- a/alias/locale/it_IT/fusiondirectory.po
+++ b/alias/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/alias/locale/ja/fusiondirectory.po b/alias/locale/ja/fusiondirectory.po
index a82f68c8f5f1b1286708bb2f87673b0940798fd4..3a74b8950806009ba5e30cff626157d0b6be026c 100644
--- a/alias/locale/ja/fusiondirectory.po
+++ b/alias/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/alias/locale/ko/fusiondirectory.po b/alias/locale/ko/fusiondirectory.po
index 1027d355c884e56fe8b189edfc289ed04e9511f0..2a6768d709b0de34e5f45bc4cc3816a9681fc8ca 100644
--- a/alias/locale/ko/fusiondirectory.po
+++ b/alias/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/alias/locale/lv/fusiondirectory.po b/alias/locale/lv/fusiondirectory.po
index 694c547599a61102d85aa51e3b5608703946caf3..bdc63ff631e2318f7de6a2b16d116bb7f3f406c3 100644
--- a/alias/locale/lv/fusiondirectory.po
+++ b/alias/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/alias/locale/nb/fusiondirectory.po b/alias/locale/nb/fusiondirectory.po
index 7cb10bde649e4576acdf5af53881ea14574c347d..3bf51db0bbd95f4ec286669242411cdd52af9f20 100644
--- a/alias/locale/nb/fusiondirectory.po
+++ b/alias/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/alias/locale/nl/fusiondirectory.po b/alias/locale/nl/fusiondirectory.po
index 248c6d31af3cc980711e7e4a73ab3eba9ed53d4a..5050aa0be20cdb6388521ca436d8b0eb1f4f8369 100644
--- a/alias/locale/nl/fusiondirectory.po
+++ b/alias/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Lucien Antonissen <lucien.antonissen@digipolis.be>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/alias/locale/pl/fusiondirectory.po b/alias/locale/pl/fusiondirectory.po
index 6aaee07f58e2a2c86ea45344ccf57e783f8be5ec..106aec715d07a9aa1051a8cdf9b6a729197262e2 100644
--- a/alias/locale/pl/fusiondirectory.po
+++ b/alias/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/alias/locale/pt/fusiondirectory.po b/alias/locale/pt/fusiondirectory.po
index 6825884f2ac7cc8665eebfaa4f497559545bf77e..ac810eabe232c748fe2e2e07d5e6f33a17740f92 100644
--- a/alias/locale/pt/fusiondirectory.po
+++ b/alias/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/alias/locale/pt_BR/fusiondirectory.po b/alias/locale/pt_BR/fusiondirectory.po
index adeece7f1508845f63f260b9197f17381e153f20..04a0cbed31efc26dd9c7b46a79099b6f9032ee5c 100644
--- a/alias/locale/pt_BR/fusiondirectory.po
+++ b/alias/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/alias/locale/ru/fusiondirectory.po b/alias/locale/ru/fusiondirectory.po
index f197cc6a29b8ed51857ee866da58c9a54ab2f3ec..87ac47dce9fe6f89e3cf804834233074c3e22b3b 100644
--- a/alias/locale/ru/fusiondirectory.po
+++ b/alias/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/alias/locale/ru@petr1708/fusiondirectory.po b/alias/locale/ru@petr1708/fusiondirectory.po
index 27b86d9e00492c17e4b68a59b29a8a4116e106be..cb33aaf541d3e396435b0094f35cdf7e693e7d99 100644
--- a/alias/locale/ru@petr1708/fusiondirectory.po
+++ b/alias/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/alias/locale/sv/fusiondirectory.po b/alias/locale/sv/fusiondirectory.po
index e489a4c16ca190cb4b21c4575e06170b21e17a51..a71ae087fb486a3c9ef7cfb1caecf07cf1668739 100644
--- a/alias/locale/sv/fusiondirectory.po
+++ b/alias/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/alias/locale/tr_TR/fusiondirectory.po b/alias/locale/tr_TR/fusiondirectory.po
index 3907175afbd489d424e670bf34c10f102f8f1f01..f8ee56e162784a4e3bb8e93c51dbee42f4d0452a 100644
--- a/alias/locale/tr_TR/fusiondirectory.po
+++ b/alias/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/alias/locale/ug/fusiondirectory.po b/alias/locale/ug/fusiondirectory.po
index c95b9f8f405ba629b97cd511595fd6975904fe89..3f7558e051c60d1a999b4483d2de07cdf40749d7 100644
--- a/alias/locale/ug/fusiondirectory.po
+++ b/alias/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/alias/locale/vi_VN/fusiondirectory.po b/alias/locale/vi_VN/fusiondirectory.po
index 63af13266b81a5d6a92075bac8def6ad07add209..796a360cd61db33eb97f9aa342116e0bc6d5f074 100644
--- a/alias/locale/vi_VN/fusiondirectory.po
+++ b/alias/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/alias/locale/zh/fusiondirectory.po b/alias/locale/zh/fusiondirectory.po
index a92bd4c21ff64eb603b00b142ae1a9400905a937..7709806adb3f40f62b3c3c026a8f86bfe6aeda92 100644
--- a/alias/locale/zh/fusiondirectory.po
+++ b/alias/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/alias/locale/zh_TW/fusiondirectory.po b/alias/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..1dc9508fdd5879b1b7e4a925d2841eee6092b164
--- /dev/null
+++ b/alias/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,148 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/alias/class_mailAliasDistribution.inc:31
+#: admin/alias/class_mailAliasDistribution.inc:32
+#: admin/alias/class_mailAliasDistribution.inc:35
+msgid "Temporary mail distribution"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:51
+msgid "Mail distribution"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:54
+#: admin/alias/class_mailAliasRedirection.inc:55
+msgid "Name"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:54
+msgid "Name to identify this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:56
+#: admin/alias/class_mailAliasRedirection.inc:57
+msgid "Description"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:56
+msgid "Description of this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:60
+msgid "Email address"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:65
+msgid "Email aliases"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:65
+msgid "Aliases for this email address"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:70
+msgid "Mail server"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:70
+msgid "Mail server for this alias"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:75
+#: admin/alias/class_mailAliasRedirection.inc:73
+msgid "Expiration date"
+msgstr ""
+
+#: admin/alias/class_mailAliasDistribution.inc:75
+msgid ""
+"Date after which the alias should be deleted. Leave empty for no deletion."
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:31
+#: admin/alias/class_mailAliasRedirection.inc:32
+#: admin/alias/class_mailAliasRedirection.inc:35
+msgid "Temporary mail redirection"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:52
+msgid "Mail redirection"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:55
+msgid "Name to identify this redirection"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:57
+msgid "Description of this redirection"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:62
+msgid "Redirect from"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:62
+msgid "Mail address from which you want to redirect"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:68
+msgid "Redirect to"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:68
+msgid "Destination of this redirection"
+msgstr ""
+
+#: admin/alias/class_mailAliasRedirection.inc:73
+msgid ""
+"Date after which the redirection should be deleted. Leave empty for no "
+"deletion."
+msgstr ""
+
+#: admin/alias/class_aliasManagement.inc:33
+msgid "Aliases"
+msgstr ""
+
+#: admin/alias/class_aliasManagement.inc:34
+msgid "Alias management"
+msgstr ""
+
+#: admin/alias/class_aliasManagement.inc:38
+msgid "Mail aliases"
+msgstr ""
+
+#: config/alias/class_aliasConfig.inc:28
+msgid "Alias configuration"
+msgstr ""
+
+#: config/alias/class_aliasConfig.inc:29
+msgid "FusionDirectory alias plugin configuration"
+msgstr ""
+
+#: config/alias/class_aliasConfig.inc:42
+msgid "Alias"
+msgstr ""
+
+#: config/alias/class_aliasConfig.inc:45
+msgid "Alias RDN"
+msgstr ""
+
+#: config/alias/class_aliasConfig.inc:45
+msgid "Branch in which aliases will be stored"
+msgstr ""
diff --git a/applications/locale/af_ZA/fusiondirectory.po b/applications/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..c6bbe3263d9f927f3743a4049b1685515359eb47
--- /dev/null
+++ b/applications/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,223 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/applications/class_applicationManagement.inc:28
+#: admin/roles/class_applicationRights.inc:30
+#: admin/roles/class_applicationRights.inc:49
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
+msgid "Applications"
+msgstr ""
+
+#: admin/applications/class_applicationManagement.inc:29
+msgid "Application management"
+msgstr ""
+
+#: admin/applications/class_applicationManagement.inc:87
+msgid "Web applications"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:28
+#: admin/applications/class_webApplication.inc:31
+msgid "Web application"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:29
+msgid "Web applicationts names, icons and links"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:45
+#: admin/applications/class_applicationGeneric.inc:29
+#: admin/applications/class_applicationGeneric.inc:32
+#: admin/applications/class_applicationGeneric.inc:46
+msgid "Application"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:49
+msgid "Name"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:49
+msgid "Name or id for application"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:53
+#: admin/applications/class_applicationGeneric.inc:54
+msgid "Description"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:53
+#: admin/applications/class_applicationGeneric.inc:54
+msgid "A short description of this application"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:57
+msgid "URL"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:57
+msgid "Link to this application"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:61
+msgid "Display Name"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:61
+msgid "Displayed name for links to this application"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:67
+#: admin/applications/class_applicationGeneric.inc:68
+msgid "Icon"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:70
+#: admin/applications/class_applicationGeneric.inc:71
+msgid "The icon for this application"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:75
+msgid "Icon location"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:75
+msgid "Usual path to this application icon"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:30
+msgid "Application information"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:50
+msgid "Application name"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:50
+msgid "The name of this application"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:58
+msgid "Execute"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:58
+msgid "The application to be executed"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:62
+msgid "Display name"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:62
+msgid "The displayed name for this application"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:78
+msgid "Options"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:81
+msgid "Only executable for member"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:81
+msgid "Only executable by the memebers of the group"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:86
+msgid "Replace user configuration on startup"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:86
+msgid "Replace the user configuration on startup"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:91
+msgid "Place icon on members desktop"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:91
+msgid "Put an icon on the user desktop"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:96
+msgid "Place entry in members startmenu"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:96
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "Put an entry in the startup menu"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "Place entry in members launch bar"
+msgstr ""
+
+#: admin/roles/class_applicationRights.inc:31
+msgid "Applications allowed for this role"
+msgstr ""
+
+#: admin/roles/class_applicationRights.inc:45
+msgid "Application list"
+msgstr ""
+
+#: admin/roles/class_applicationRights.inc:49
+msgid "The applications users with this role are allowed to launch"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:29
+msgid "Applications plugin configuration"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Application RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Branch in which applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Web applications RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Branch in which web applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Show web applications in menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Whether to show web applications in FD main menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "None"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "Only allowed"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "All"
+msgstr ""
diff --git a/applications/locale/ar/fusiondirectory.po b/applications/locale/ar/fusiondirectory.po
index 4d8fa779066856502f69aa6ec0bd99051b68e3f9..e3f5ed87e86a0aa8e0028038bd051bea40cdf19c 100644
--- a/applications/locale/ar/fusiondirectory.po
+++ b/applications/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/applications/locale/ca/fusiondirectory.po b/applications/locale/ca/fusiondirectory.po
index bead0f6a2c54f539a914c6675a8986acd3388bae..0a92f545868b721862b575f96727dfa2e706400f 100644
--- a/applications/locale/ca/fusiondirectory.po
+++ b/applications/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/applications/locale/cs_CZ/fusiondirectory.po b/applications/locale/cs_CZ/fusiondirectory.po
index 83e80843a7c74be82642f9f3fc1a7234a2d80991..ae649bf0c3376a5f6a894f84fbe87cc2c8ae3b9d 100644
--- a/applications/locale/cs_CZ/fusiondirectory.po
+++ b/applications/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
diff --git a/applications/locale/de/fusiondirectory.po b/applications/locale/de/fusiondirectory.po
index 78294d74bf46b1b2f29b2e42ec7c2638c054e34b..fdd266c51ddf4bb7d4c9b55447346f855d0bde57 100644
--- a/applications/locale/de/fusiondirectory.po
+++ b/applications/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/applications/locale/el_GR/fusiondirectory.po b/applications/locale/el_GR/fusiondirectory.po
index c9f090cc8e39f7454a11ecaed531cd3dc967cf9c..b3179faaab5708a14960d811957cae308d1b6402 100644
--- a/applications/locale/el_GR/fusiondirectory.po
+++ b/applications/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/applications/locale/es/fusiondirectory.po b/applications/locale/es/fusiondirectory.po
index 4ca87d9de3c52801c97e1eeb4f129e7599f74a25..0d85b4c6a1c597f7492247802985b0e1f9e7e9be 100644
--- a/applications/locale/es/fusiondirectory.po
+++ b/applications/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/applications/locale/es_CO/fusiondirectory.po b/applications/locale/es_CO/fusiondirectory.po
index 5b341e432c234848201d9d6d3155a6fc69f397dd..8c7013466999324493ef2891df0d566420837e68 100644
--- a/applications/locale/es_CO/fusiondirectory.po
+++ b/applications/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/applications/locale/es_VE/fusiondirectory.po b/applications/locale/es_VE/fusiondirectory.po
index 20ed285011e0bae5024afa62f6787cd7707ef5bc..5f13d0101198518cc4a348a17eb67fc9d28521c2 100644
--- a/applications/locale/es_VE/fusiondirectory.po
+++ b/applications/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/applications/locale/fa_IR/fusiondirectory.po b/applications/locale/fa_IR/fusiondirectory.po
index 39d0d797e1befb9d14af18f364e2a6bf99c94f2e..9ea93e6593076c3c0097b754475ba620f79da491 100644
--- a/applications/locale/fa_IR/fusiondirectory.po
+++ b/applications/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/applications/class_applicationManagement.inc:28
 #: admin/roles/class_applicationRights.inc:30
diff --git a/applications/locale/fi_FI/fusiondirectory.po b/applications/locale/fi_FI/fusiondirectory.po
index bb67240bbb9bb7c0b9a106699a4ab196a0c4a377..b504a922d8e0583f63480c73f5675f1f1fb63e06 100644
--- a/applications/locale/fi_FI/fusiondirectory.po
+++ b/applications/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/applications/locale/fr/fusiondirectory.po b/applications/locale/fr/fusiondirectory.po
index 8a15c2773997d9da4338231436c3fa55019ccef5..2d3100fdff55ebabb6835ded85fe40a5a1732f85 100644
--- a/applications/locale/fr/fusiondirectory.po
+++ b/applications/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/applications/locale/hu_HU/fusiondirectory.po b/applications/locale/hu_HU/fusiondirectory.po
index cc56c06c3bb1d98fbc3e129d8cd762fb68cc3ece..5c7c60ea07c68f4335bc320fa2a49c8d9e545be1 100644
--- a/applications/locale/hu_HU/fusiondirectory.po
+++ b/applications/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/applications/locale/id/fusiondirectory.po b/applications/locale/id/fusiondirectory.po
index 695277f80b5e9a6ba633c1843ff0851b27678de4..ab8b44c6211e00088dd8f18659028741e642f642 100644
--- a/applications/locale/id/fusiondirectory.po
+++ b/applications/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/applications/locale/it_IT/fusiondirectory.po b/applications/locale/it_IT/fusiondirectory.po
index 20f7a9aff2272e21fb143fc7c1c2a800e15e8ee1..01fedc878b0bbf9152a438a86e1ede0716e31173 100644
--- a/applications/locale/it_IT/fusiondirectory.po
+++ b/applications/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/applications/locale/ja/fusiondirectory.po b/applications/locale/ja/fusiondirectory.po
index b5f16fb42e82599a35186b4d7c1926a7fcb57162..e5f93df99a98e10458db71f9c7858c537261f69a 100644
--- a/applications/locale/ja/fusiondirectory.po
+++ b/applications/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/applications/locale/ko/fusiondirectory.po b/applications/locale/ko/fusiondirectory.po
index 187ecc703b3655e76416ddeac9dcc01e645aa2b8..8546ad3073ef10df2668b76baec6f38816702a52 100644
--- a/applications/locale/ko/fusiondirectory.po
+++ b/applications/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/applications/locale/lv/fusiondirectory.po b/applications/locale/lv/fusiondirectory.po
index db83e81cea363a7b044248de9c670ba5455efa3f..18ce051f962be4ecd5ab42f3fb913906df0406e6 100644
--- a/applications/locale/lv/fusiondirectory.po
+++ b/applications/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/applications/locale/nb/fusiondirectory.po b/applications/locale/nb/fusiondirectory.po
index d6f5b7f2187eea16588d0fc83e564c62b8bcc11a..98f22d7bd2e806291300efd59058811fcf823d28 100644
--- a/applications/locale/nb/fusiondirectory.po
+++ b/applications/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/applications/locale/nl/fusiondirectory.po b/applications/locale/nl/fusiondirectory.po
index 6d28f80fb5e1ae108127e77b5683f25fd61cb30c..687e69d1e374af82f0231b8c34f5582ef300a196 100644
--- a/applications/locale/nl/fusiondirectory.po
+++ b/applications/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/applications/locale/pl/fusiondirectory.po b/applications/locale/pl/fusiondirectory.po
index 7154157d7e241b9a18a28bd891babceb994be0f1..0fb4d958773ffa2cb1327ded9a1445bb406fde9e 100644
--- a/applications/locale/pl/fusiondirectory.po
+++ b/applications/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/applications/locale/pt/fusiondirectory.po b/applications/locale/pt/fusiondirectory.po
index 7df000a03001b12418b6506cc5afc2165fa6151c..6891a2c68edcf89dca1163bf83e725e220a0952e 100644
--- a/applications/locale/pt/fusiondirectory.po
+++ b/applications/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/applications/locale/pt_BR/fusiondirectory.po b/applications/locale/pt_BR/fusiondirectory.po
index eb4ac8943f03b0e47dd0c50b27d8c3e10507e7de..2adbfd64ec0ccca0100fbbc13a1419611991f92c 100644
--- a/applications/locale/pt_BR/fusiondirectory.po
+++ b/applications/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/applications/locale/ru/fusiondirectory.po b/applications/locale/ru/fusiondirectory.po
index 902694da2dfd195ee19fde18348e778478045978..4eceed2f723200553f57d3fb6d6c2ec66ca1caa7 100644
--- a/applications/locale/ru/fusiondirectory.po
+++ b/applications/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/applications/locale/ru@petr1708/fusiondirectory.po b/applications/locale/ru@petr1708/fusiondirectory.po
index d6cca9d05de4b95ed8691428f1676e79558f58e4..fd339d36e082580d3b77d4d2de0ceb5eaf64a9e4 100644
--- a/applications/locale/ru@petr1708/fusiondirectory.po
+++ b/applications/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/applications/locale/sv/fusiondirectory.po b/applications/locale/sv/fusiondirectory.po
index 9d1c98986fa371a98f08918a0ce3cfd2aecac828..efb2e85be8c09aa268c9a163218f6fae305f89b8 100644
--- a/applications/locale/sv/fusiondirectory.po
+++ b/applications/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/applications/locale/tr_TR/fusiondirectory.po b/applications/locale/tr_TR/fusiondirectory.po
index efc3abb484d3350afd29ec7d4dc05dc0239e7e44..f5517dc267b2abfa6c7bb957c6296a8903860faa 100644
--- a/applications/locale/tr_TR/fusiondirectory.po
+++ b/applications/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/applications/locale/ug/fusiondirectory.po b/applications/locale/ug/fusiondirectory.po
index afdddf14803d148aadb8b2d22d5cba469f4099c9..49c9bb4820f32617b1eb9fb87a1b5b6db3266f02 100644
--- a/applications/locale/ug/fusiondirectory.po
+++ b/applications/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/applications/locale/vi_VN/fusiondirectory.po b/applications/locale/vi_VN/fusiondirectory.po
index f27a0b7947de6eb10a6108a30bd31a592db949ca..55140eeaee5a1b071816aa9d911627c7af21f416 100644
--- a/applications/locale/vi_VN/fusiondirectory.po
+++ b/applications/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/applications/locale/zh/fusiondirectory.po b/applications/locale/zh/fusiondirectory.po
index 51677c3e2a25b89a64eea168147510bf1dfefc3b..4eae1584f18b828f97ba5c365b0adb80e1f2263c 100644
--- a/applications/locale/zh/fusiondirectory.po
+++ b/applications/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/applications/locale/zh_TW/fusiondirectory.po b/applications/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..6ba742055f62edd9d7dff886d5e997587578ae71
--- /dev/null
+++ b/applications/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,223 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/applications/class_applicationManagement.inc:28
+#: admin/roles/class_applicationRights.inc:30
+#: admin/roles/class_applicationRights.inc:49
+#: config/applications/class_applicationsPluginConfig.inc:28
+#: config/applications/class_applicationsPluginConfig.inc:40
+msgid "Applications"
+msgstr ""
+
+#: admin/applications/class_applicationManagement.inc:29
+msgid "Application management"
+msgstr ""
+
+#: admin/applications/class_applicationManagement.inc:87
+msgid "Web applications"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:28
+#: admin/applications/class_webApplication.inc:31
+msgid "Web application"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:29
+msgid "Web applicationts names, icons and links"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:45
+#: admin/applications/class_applicationGeneric.inc:29
+#: admin/applications/class_applicationGeneric.inc:32
+#: admin/applications/class_applicationGeneric.inc:46
+msgid "Application"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:49
+msgid "Name"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:49
+msgid "Name or id for application"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:53
+#: admin/applications/class_applicationGeneric.inc:54
+msgid "Description"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:53
+#: admin/applications/class_applicationGeneric.inc:54
+msgid "A short description of this application"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:57
+msgid "URL"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:57
+msgid "Link to this application"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:61
+msgid "Display Name"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:61
+msgid "Displayed name for links to this application"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:67
+#: admin/applications/class_applicationGeneric.inc:68
+msgid "Icon"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:70
+#: admin/applications/class_applicationGeneric.inc:71
+msgid "The icon for this application"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:75
+msgid "Icon location"
+msgstr ""
+
+#: admin/applications/class_webApplication.inc:75
+msgid "Usual path to this application icon"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:30
+msgid "Application information"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:50
+msgid "Application name"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:50
+msgid "The name of this application"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:58
+msgid "Execute"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:58
+msgid "The application to be executed"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:62
+msgid "Display name"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:62
+msgid "The displayed name for this application"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:78
+msgid "Options"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:81
+msgid "Only executable for member"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:81
+msgid "Only executable by the memebers of the group"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:86
+msgid "Replace user configuration on startup"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:86
+msgid "Replace the user configuration on startup"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:91
+msgid "Place icon on members desktop"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:91
+msgid "Put an icon on the user desktop"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:96
+msgid "Place entry in members startmenu"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:96
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "Put an entry in the startup menu"
+msgstr ""
+
+#: admin/applications/class_applicationGeneric.inc:101
+msgid "Place entry in members launch bar"
+msgstr ""
+
+#: admin/roles/class_applicationRights.inc:31
+msgid "Applications allowed for this role"
+msgstr ""
+
+#: admin/roles/class_applicationRights.inc:45
+msgid "Application list"
+msgstr ""
+
+#: admin/roles/class_applicationRights.inc:49
+msgid "The applications users with this role are allowed to launch"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:29
+msgid "Applications plugin configuration"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Application RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:43
+msgid "Branch in which applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Web applications RDN"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:48
+msgid "Branch in which web applications will be stored"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Show web applications in menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:53
+msgid "Whether to show web applications in FD main menu"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "None"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "Only allowed"
+msgstr ""
+
+#: config/applications/class_applicationsPluginConfig.inc:56
+msgid "All"
+msgstr ""
diff --git a/argonaut/admin/systems/services/argonaut/class_argonautServer.inc b/argonaut/admin/systems/services/argonaut/class_argonautServer.inc
index 01159306daa8bc44da6677b76025f362a13de4d5..34b4c712469ed720cbf5b925562bb8d43d33f1a7 100644
--- a/argonaut/admin/systems/services/argonaut/class_argonautServer.inc
+++ b/argonaut/admin/systems/services/argonaut/class_argonautServer.inc
@@ -131,7 +131,7 @@ class argonautServer extends simpleService
   {
     parent::__construct($dn, $parent);
     if ($this->argonautServerToken == '') {
-      $this->argonautServerToken = md5(mt_rand());
+      $this->argonautServerToken = md5(random_int(0, PHP_INT_MAX));
     }
     $this->attributesAccess['argonautProtocol']->setManagedAttributes(
       array(
diff --git a/argonaut/locale/af_ZA/fusiondirectory.po b/argonaut/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..f2b4a452d4f9d49ed433a344e6a04ad19e218485
--- /dev/null
+++ b/argonaut/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,869 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
+msgstr ""
+
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
+msgstr ""
+
+#: include/class_supportDaemon.inc:616
+#, php-format
+msgid "Could not read \"%s\"!"
+msgstr ""
+
+#: include/class_supportDaemon.inc:620
+#, php-format
+msgid "\"%s\" is not a file!"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
+msgid "Argonaut Fuse OPSI module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
+msgid "OPSI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:50
+msgid "Opsi admin"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:55
+msgid "Opsi password"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:60
+msgid "Opsi server"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:65
+msgid "Opsi lang"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
+msgid "Argonaut Fuse FAI module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
+msgid "FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "FAI flags"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
+msgid "NFS root"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:31
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+#: admin/systems/services/argonaut/class_argonautServer.inc:46
+msgid "Argonaut server"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages information"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:56
+msgid ""
+"Wether or not argonaut server should get packages information from "
+"repositories at start and then once a day. Needed for FAI package list "
+"creation."
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+#: admin/systems/argonaut/class_argonautClient.inc:139
+msgid "Protocol"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+#: admin/systems/argonaut/class_argonautClient.inc:139
+msgid "Protocol to use for argonaut"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Log directory"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+#: admin/systems/argonaut/class_argonautClient.inc:161
+msgid "SSL paths"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+#: admin/systems/argonaut/class_argonautClient.inc:164
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+#: admin/systems/argonaut/class_argonautClient.inc:169
+msgid "Certificate"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+#: admin/systems/argonaut/class_argonautClient.inc:174
+msgid "CA certificate"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+#: admin/systems/argonaut/class_argonautClient.inc:179
+msgid "CN of the certificate"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+msgid "Argonaut Fuse LTSP module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:47
+msgid "LTSP"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:50
+msgid "LTSP server"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+msgid "Proxy"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
+msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
+msgid ""
+"Causes debmirror to ignore missing or broken deb and source files but still "
+"be pedantic about checking meta files"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Source"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Include source in the mirror"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+msgid "Contents"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
+msgid ""
+"Additionally download Contents.<arch>.gz files (Note that these files can be"
+" relatively big and can change frequently)"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Verbose"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Wether to activate verbose mode"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
+msgid "Argonaut DNS settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
+msgid "Ldap2zone global settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
+msgid "Bind directory"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
+msgid "The directory in which conf file must be created"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
+msgid "Bind cache directory"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
+msgid "The directory in which zone files must be created"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
+msgid "TTL"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
+msgid "Time to live"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
+msgid "rndc path"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
+msgid "path to rndc binary"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
+msgid "Search base"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
+msgid ""
+"LDAP base in which ldap2zone should search. Only usefull if you got several "
+"nodes for the same zone."
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
+msgid "Ldap2zone master settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+msgid "Ignore reverse zone"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+msgid "Do not write reverse zone"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+msgid "Notify"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+msgid "Allow update"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+msgid "Allow update (semicolon separated and ended)"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+msgid "Allow transfer"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+msgid "Allow transfer (semicolon separated and ended)"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
+msgid "Check names"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
+msgid ""
+"Cause any host name for the zone to be checked for compliance with RFC 952 "
+"and RFC 1123 and take the defined action"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+msgid "Ldap2zone slave settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "Manage DNS Slaves"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+msgid "zone"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+msgid "DNS zone this server should be declared as slave of"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+msgid "master"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+msgid "Master IP(s) for this zone"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
+msgid "reverses"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
+msgid "This server should be slave of reverses zones as well"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
+msgid "DNS slaves"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:164
+msgid "Path to the private key file on Argonaut client"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:169
+msgid "Path to the certificate file on Argonaut client"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:174
+msgid "Path to the CA certificate file on Argonaut client"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:179
+msgid "The CN in this client certificate"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:185
+msgid "Service names"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:187
+msgid "Argonaut service names"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:33
+#: addons/argonaut/class_argonautImportFile.inc:36
+msgid "Argonaut task import"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:34
+msgid "Imports argonaut tasks from CSV file"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:49
+msgid "Import actions from CSV file"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:53
+msgid "Import a list of task into argonaut"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:63
+msgid "Upload"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:67
+msgid "Import file"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:72
+msgid "Imported tasks"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
+#: addons/argonaut/deploy-list.xml:79
+msgid "Import"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:122
+msgid "Fix the errors in your CSV file first"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:138
+msgid "Infrastructure service"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:145
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:157
+msgid "file is empty"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:182
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:185
+#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
+msgid "Event"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
+msgstr ""
+
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
+msgstr ""
+
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:123
+#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+msgid "Remove"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:124
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:188
+msgid "Info"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:188
+#, php-format
+msgid "%s"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:214
+msgid "Error detail"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:256
+#, php-format
+msgid "Cannot update queue entries."
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:324
+msgid "immediately"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:336
+msgid "Waiting"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:339
+msgid "Show error"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:343
+msgid "Processed"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:352
+msgid "in progress"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+msgid "Abort"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:108
+msgid "Execute"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:120
+msgid "Process now"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:128
+msgid "View logs"
+msgstr ""
+
+#: addons/argonaut/class_argonautEventTypes.inc:67
+msgid "Switch off"
+msgstr ""
+
+#: addons/argonaut/class_argonautEventTypes.inc:80
+msgid "Reboot"
+msgstr ""
+
+#: addons/argonaut/class_argonautEventTypes.inc:84
+msgid "Wake up"
+msgstr ""
+
+#: addons/argonaut/class_argonautEventTypes.inc:88
+msgid "Software update"
+msgstr ""
+
+#: addons/argonaut/class_argonautEventTypes.inc:92
+msgid "(Re)Install"
+msgstr ""
+
+#: addons/argonaut/class_argonautEventTypes.inc:105
+msgid "Refresh slave files (ldap2zone)"
+msgstr ""
+
+#: addons/argonaut/import_events.tpl.c:2
+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 ""
+
+#: addons/argonaut/import_events.tpl.c:5
+msgid "timestamp"
+msgstr ""
+
+#: addons/argonaut/import_events.tpl.c:8
+msgid "MAC-address"
+msgstr ""
+
+#: addons/argonaut/import_events.tpl.c:11
+msgid "job type"
+msgstr ""
+
+#: addons/argonaut/import_events.tpl.c:14
+msgid "object group"
+msgstr ""
+
+#: addons/argonaut/import_events.tpl.c:17
+msgid "Available job types: %1"
+msgstr ""
+
+#: addons/argonaut/import_events.tpl.c:20
+msgid "Timestamp"
+msgstr ""
+
+#: addons/argonaut/import_events.tpl.c:29
+msgid "Object group"
+msgstr ""
diff --git a/argonaut/locale/ar/fusiondirectory.po b/argonaut/locale/ar/fusiondirectory.po
index 952a5f406115301b904e4854ef4326db82f76544..2dcaf791fafae54a45b73d0d1aca5886060cf6b9 100644
--- a/argonaut/locale/ar/fusiondirectory.po
+++ b/argonaut/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -42,7 +42,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -69,23 +68,53 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+msgid "FAI flags"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/ca/fusiondirectory.po b/argonaut/locale/ca/fusiondirectory.po
index 406c0b3e9ece35916e34a13c1fde57a58d6dfed4..032918f2ecd812d5b326beeb5ca2bfb7f620c711 100644
--- a/argonaut/locale/ca/fusiondirectory.po
+++ b/argonaut/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -42,7 +42,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -69,23 +68,53 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+msgid "FAI flags"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/cs_CZ/fusiondirectory.po b/argonaut/locale/cs_CZ/fusiondirectory.po
index d20e4e477b0d94d920cf6d74f36ca6a1bc3cec91..7a826e05ce298e6b028d658ac39acdddd5327cfa 100644
--- a/argonaut/locale/cs_CZ/fusiondirectory.po
+++ b/argonaut/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: include/class_supportDaemon.inc:107
 msgid "Multiple argonaut server found. Only one is supported"
@@ -42,7 +42,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr "Nastavení Fuse OPSI modulu pro Argonaut"
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -69,24 +68,54 @@ msgstr "server Opsi"
 msgid "Opsi lang"
 msgstr "jazyk Opsi"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr "Nastavení Fuse FAI modulu pro Argonaut"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr "FAI"
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
-msgstr "příznaky FAI"
+msgid "FAI flags"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr ""
 "kořen struktury složek, nacházející se na síťovém souborovém systému (NFS)"
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/de/fusiondirectory.po b/argonaut/locale/de/fusiondirectory.po
index d9f4138c2f2d05048f2550cd2b597304b90d8972..bfcf24a348783ed91ca4990f50175f2522d1ceeb 100644
--- a/argonaut/locale/de/fusiondirectory.po
+++ b/argonaut/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -42,7 +42,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr "Argonaut Fuse OPSI Moduleinstellungen"
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -69,23 +68,53 @@ msgstr "Opsi Server"
 msgid "Opsi lang"
 msgstr "Opsi lang"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr "Argonaut Fuse FAI Moduleinstellungen"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr "FAI"
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
-msgstr "Fai Flags"
+msgid "FAI flags"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr "NFS root"
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/el_GR/fusiondirectory.po b/argonaut/locale/el_GR/fusiondirectory.po
index 900734f51026203a478cb5d5ffecea6c4af3fdfc..9274b08b69cf9a38fe915758cb58c196a63b9ca1 100644
--- a/argonaut/locale/el_GR/fusiondirectory.po
+++ b/argonaut/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -42,7 +42,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -69,23 +68,53 @@ msgstr "Διακομιστής Opsi"
 msgid "Opsi lang"
 msgstr "Γλώσσα Opsi"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr "FAI"
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+msgid "FAI flags"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/es/fusiondirectory.po b/argonaut/locale/es/fusiondirectory.po
index f0a7234bf436a3eeb7e9a65de510ad228f67b6b2..98b7d5e704cff50c27a70b9c9536fca504e1ebfc 100644
--- a/argonaut/locale/es/fusiondirectory.po
+++ b/argonaut/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -42,7 +42,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -69,23 +68,53 @@ msgstr "Servidor Opsi"
 msgid "Opsi lang"
 msgstr "Idioma Opsi"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr "FAI"
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
-msgstr "Banderas de Fai"
+msgid "FAI flags"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr "Raiz NFS"
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/es_CO/fusiondirectory.po b/argonaut/locale/es_CO/fusiondirectory.po
index 4f19828d206486f3692f40c931dca1c47e6473ec..79d28c90a2b971dc50ccf3ccb46a9bdb5b7ce16d 100644
--- a/argonaut/locale/es_CO/fusiondirectory.po
+++ b/argonaut/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -42,7 +42,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -69,23 +68,53 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+msgid "FAI flags"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/es_VE/fusiondirectory.po b/argonaut/locale/es_VE/fusiondirectory.po
index c16800c792d00941994827a574d0e42d30f8773d..6f2a0c65f845f2839f2e6687b4d4ab9006667c72 100644
--- a/argonaut/locale/es_VE/fusiondirectory.po
+++ b/argonaut/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -42,7 +42,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -69,23 +68,53 @@ msgstr "Servidor Opsi"
 msgid "Opsi lang"
 msgstr "Idioma Opsi"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr "FAI"
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
-msgstr "Banderas de Fai"
+msgid "FAI flags"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr "Raiz NFS"
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/fa_IR/fusiondirectory.po b/argonaut/locale/fa_IR/fusiondirectory.po
index 61e311837f4e599699b4b79febc0dee5cb5eacad..3438fd337551e420f9a523ca99a446362f80f19b 100644
--- a/argonaut/locale/fa_IR/fusiondirectory.po
+++ b/argonaut/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa_IR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: include/class_supportDaemon.inc:107
 msgid "Multiple argonaut server found. Only one is supported"
@@ -42,7 +42,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -69,23 +68,53 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+msgid "FAI flags"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/fi_FI/fusiondirectory.po b/argonaut/locale/fi_FI/fusiondirectory.po
index 658bcea5047e92d594cead08868efe084cdbb958..18f50c2aa574acf4cbdd54b1426eec9e0071e6f2 100644
--- a/argonaut/locale/fi_FI/fusiondirectory.po
+++ b/argonaut/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
@@ -42,7 +42,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -69,23 +68,53 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+msgid "FAI flags"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/fr/fusiondirectory.po b/argonaut/locale/fr/fusiondirectory.po
index 3bbf845402ad9f8da419551d469525c9e259a164..288a6ae0c95dd9fed713e4412097ba242bccfd67 100644
--- a/argonaut/locale/fr/fusiondirectory.po
+++ b/argonaut/locale/fr/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2018\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"
@@ -44,7 +44,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr "Paramètres de Argonaut Fuse pour le module OPSI"
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -71,23 +70,55 @@ msgstr "Serveur OPSI"
 msgid "Opsi lang"
 msgstr "Langue OPSI"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr "Paramètres de Argonaut Fuse pour le module FAI"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr "FAI"
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr "Version de FAI"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr "Version de FAI installe sur le serveur"
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+msgid "FAI flags"
 msgstr "Paramètres FAI"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr "Paramètres a passer a FAI"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr "Racine NFS"
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr "Ligne de commande FAI 4"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+"la ligne de commande pour FAI 4 - should be \"ip=dhcp root=/dev/nfs "
+"boot=live union=aufs\""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr "Ligne de commande FAI 5"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr "la ligne de commande pour FAI 5 -doit etre \"ip=dhcp rootovl\""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/hu_HU/fusiondirectory.po b/argonaut/locale/hu_HU/fusiondirectory.po
index b51512516023c06abb7061c02cf5ed78db4bc882..81ccdb0b915fa2050473c9698b513ca1ecf8b391 100644
--- a/argonaut/locale/hu_HU/fusiondirectory.po
+++ b/argonaut/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -41,7 +41,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -68,23 +67,53 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+msgid "FAI flags"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/id/fusiondirectory.po b/argonaut/locale/id/fusiondirectory.po
index 08552f1052a7feb82f983abed33649ded3f66b8d..66eca1d39c5d4c674cad39eccaa08bbce832b42c 100644
--- a/argonaut/locale/id/fusiondirectory.po
+++ b/argonaut/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -41,7 +41,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -68,23 +67,53 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+msgid "FAI flags"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/it_IT/fusiondirectory.po b/argonaut/locale/it_IT/fusiondirectory.po
index bbc6752f7f460da30b0a57cf1f4180dc982e4ba8..132a84f5eb9e24968e32f8af22d5c5af9c3e9770 100644
--- a/argonaut/locale/it_IT/fusiondirectory.po
+++ b/argonaut/locale/it_IT/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2018\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"
@@ -42,7 +42,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr "Impostazioni del modulo Argonaut Fuse OPSI"
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -69,23 +68,55 @@ msgstr "Server Opsi"
 msgid "Opsi lang"
 msgstr "Lingua di Opsi"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr "Impostazioni del modulo Argonaut Fuse FAI"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr "FAI"
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr "Versione di FAI"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr "Versione di FAI installata sul server"
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
-msgstr "Fai flags"
+msgid "FAI flags"
+msgstr "Flag FAI"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr "Flag per passare a FAI"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr "Radice NFS"
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr "Riga di comando FAI 4"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+"La riga di comando FAI 4 - dovrebbe essere \"ip=dhcp root=/dev/nfs boot=live"
+" union=aufs\""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr "Riga di comando FAI 5"
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr "La riga di comando FAI 5 - dovrebbe essere \"ip=dhcp rootovl\""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/ja/fusiondirectory.po b/argonaut/locale/ja/fusiondirectory.po
index 858c28ed25295078687e25e0686d3b8c62581540..b3db0920eb159f520712f2ba3592281409bcff35 100644
--- a/argonaut/locale/ja/fusiondirectory.po
+++ b/argonaut/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -41,7 +41,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -68,23 +67,53 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+msgid "FAI flags"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/ko/fusiondirectory.po b/argonaut/locale/ko/fusiondirectory.po
index 96b8bf135921e176f3767d505d7867a3c128c22f..aafb0734702f6be3cea2fe00f688acafbf7dfff6 100644
--- a/argonaut/locale/ko/fusiondirectory.po
+++ b/argonaut/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
@@ -42,7 +42,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -69,23 +68,53 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+msgid "FAI flags"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/lv/fusiondirectory.po b/argonaut/locale/lv/fusiondirectory.po
index f9a6783bb8b85543cc284768dfd17ceea0bc5561..e6e5025fc159cb5ba8101112345dae9b55135b2e 100644
--- a/argonaut/locale/lv/fusiondirectory.po
+++ b/argonaut/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -42,7 +42,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -69,23 +68,53 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+msgid "FAI flags"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/nb/fusiondirectory.po b/argonaut/locale/nb/fusiondirectory.po
index 4808c54961d2867c089b039a9c87e827f625d872..8b383bbfedb7a8fa88907da3f954d812b6568f31 100644
--- a/argonaut/locale/nb/fusiondirectory.po
+++ b/argonaut/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -42,7 +42,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -69,23 +68,53 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+msgid "FAI flags"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/nl/fusiondirectory.po b/argonaut/locale/nl/fusiondirectory.po
index 5fc536e572a6a5d43c3d0e63560035cfb7155462..e16d53f049d11dfd7762f11187496ea5470e53bd 100644
--- a/argonaut/locale/nl/fusiondirectory.po
+++ b/argonaut/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Rombout de Neef <rombout.deneef@digipolis.be>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
@@ -42,7 +42,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr "Argonaut Fuse Opsi module instellingen"
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -69,23 +68,53 @@ msgstr "Opsi server"
 msgid "Opsi lang"
 msgstr "Opsi lang"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr "Argonaut Fuse FAI module instellingen"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr "FAI"
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
-msgstr "Fai vlaggen"
+msgid "FAI flags"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr "NFS root"
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/pl/fusiondirectory.po b/argonaut/locale/pl/fusiondirectory.po
index 6b831bcf806fa200bd4da3b8cebaa2cf6e5c10d7..dc4b4eb00681b8b97a0383fe87c2f849923522fe 100644
--- a/argonaut/locale/pl/fusiondirectory.po
+++ b/argonaut/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -42,7 +42,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -69,23 +68,53 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr "FAI"
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+msgid "FAI flags"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/pt/fusiondirectory.po b/argonaut/locale/pt/fusiondirectory.po
index 2f7b836d1da078ef011f7ef6e425587a610b02d6..53617617c828f2cb4d29c9673774b5e1cca9f63c 100644
--- a/argonaut/locale/pt/fusiondirectory.po
+++ b/argonaut/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -42,7 +42,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -69,23 +68,53 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+msgid "FAI flags"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/pt_BR/fusiondirectory.po b/argonaut/locale/pt_BR/fusiondirectory.po
index 5826c48b266b775f42d803c542f3d8880f5e8396..1467625479b177b24be88f4ec44241e95aaf9467 100644
--- a/argonaut/locale/pt_BR/fusiondirectory.po
+++ b/argonaut/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -42,7 +42,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr "Configurações do módulo Argonaut Fuse OPSI"
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -69,23 +68,53 @@ msgstr "Servidor Opsi"
 msgid "Opsi lang"
 msgstr "Lang Opsi"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr "Módulos de configuração FAI do Argonaut Fuse"
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr "FAI"
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
-msgstr "Bandeiras fai"
+msgid "FAI flags"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr "Raiz NFS"
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/ru/fusiondirectory.po b/argonaut/locale/ru/fusiondirectory.po
index e11c99490af7688c82a25e47595adf553133d925..960a61a40079cba9e251bb6d437bc20a3781e423 100644
--- a/argonaut/locale/ru/fusiondirectory.po
+++ b/argonaut/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -42,7 +42,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -69,23 +68,53 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr "FAI"
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+msgid "FAI flags"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/ru@petr1708/fusiondirectory.po b/argonaut/locale/ru@petr1708/fusiondirectory.po
index df841ac868ff07efc076b54a21868d0e5b762237..387a3915584b8712b55f7a9cddf1171c98d58a76 100644
--- a/argonaut/locale/ru@petr1708/fusiondirectory.po
+++ b/argonaut/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -41,7 +41,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -68,23 +67,53 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+msgid "FAI flags"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/sv/fusiondirectory.po b/argonaut/locale/sv/fusiondirectory.po
index 7ef7da64b8a78f5675db46c7f473b56186f4fe3b..1d5483c64c308fb960d3f67b035b9658c8fb5b4c 100644
--- a/argonaut/locale/sv/fusiondirectory.po
+++ b/argonaut/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -42,7 +42,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -69,23 +68,53 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr "FAI"
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+msgid "FAI flags"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/tr_TR/fusiondirectory.po b/argonaut/locale/tr_TR/fusiondirectory.po
index 1c7b2920f3064d842139b66afc42d94c884497a8..204f2a08002883ec38ed33918336de90464b139f 100644
--- a/argonaut/locale/tr_TR/fusiondirectory.po
+++ b/argonaut/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
@@ -41,7 +41,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -68,23 +67,53 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+msgid "FAI flags"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/ug/fusiondirectory.po b/argonaut/locale/ug/fusiondirectory.po
index 5f7ea26bea9f4362e2a1ec690e7d7f82033fd645..9faf3e4296c9b44e4fc78f99e65abc33b3945c81 100644
--- a/argonaut/locale/ug/fusiondirectory.po
+++ b/argonaut/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -41,7 +41,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -68,23 +67,53 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+msgid "FAI flags"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/vi_VN/fusiondirectory.po b/argonaut/locale/vi_VN/fusiondirectory.po
index 0412aed79788cd82ce196cf235fe2d5d46de0cf2..3dc831f5c7c9f8535f57f0e514c6c333952d97d0 100644
--- a/argonaut/locale/vi_VN/fusiondirectory.po
+++ b/argonaut/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -42,7 +42,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -69,23 +68,53 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+msgid "FAI flags"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/zh/fusiondirectory.po b/argonaut/locale/zh/fusiondirectory.po
index 0895ed159d76267bff60a3306843d167eed1d6f6..6091f2b30fc589f6502337d206a2ffe56ea5ce4b 100644
--- a/argonaut/locale/zh/fusiondirectory.po
+++ b/argonaut/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -42,7 +42,6 @@ msgid "Argonaut Fuse OPSI module settings"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -69,23 +68,53 @@ msgstr ""
 msgid "Opsi lang"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:32
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
 msgid "Argonaut Fuse FAI module settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:47
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
 msgid "FAI"
 msgstr "自动化安装"
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
-msgid "Fai flags"
+msgid "FAI flags"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
 msgid "NFS root"
 msgstr ""
 
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
 #: admin/systems/services/argonaut/class_argonautServer.inc:31
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 #: admin/systems/services/argonaut/class_argonautServer.inc:46
diff --git a/argonaut/locale/zh_TW/fusiondirectory.po b/argonaut/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..534ae64b962f34748694a9e978cc00ae4d6c3366
--- /dev/null
+++ b/argonaut/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,869 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: include/class_supportDaemon.inc:107
+msgid "Multiple argonaut server found. Only one is supported"
+msgstr ""
+
+#: include/class_supportDaemon.inc:109
+msgid "There is no argonaut server configured"
+msgstr ""
+
+#: include/class_supportDaemon.inc:616
+#, php-format
+msgid "Could not read \"%s\"!"
+msgstr ""
+
+#: include/class_supportDaemon.inc:620
+#, php-format
+msgid "\"%s\" is not a file!"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
+msgid "Argonaut Fuse OPSI module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
+msgid "OPSI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:50
+msgid "Opsi admin"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:55
+msgid "Opsi password"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:60
+msgid "Opsi server"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:65
+msgid "Opsi lang"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:31
+msgid "Argonaut Fuse FAI module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:42
+msgid "FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "FAI version"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:45
+msgid "Version of FAI installed on the server"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "FAI flags"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
+msgid "Flags to pass to FAI"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:55
+msgid "NFS root"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid "FAI 4 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:60
+msgid ""
+"Command line for FAI 4 - should be \"ip=dhcp root=/dev/nfs boot=live "
+"union=aufs\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "FAI 5 command line"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:65
+msgid "Command line for FAI 5 - should be \"ip=dhcp rootovl\""
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:31
+#: admin/systems/services/argonaut/class_argonautServer.inc:32
+#: admin/systems/services/argonaut/class_argonautServer.inc:46
+msgid "Argonaut server"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:49
+msgid "Delete finished tasks"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:50
+msgid ""
+"Wether or not argonaut server should delete successfully finished tasks"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:55
+msgid "Get packages information"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:56
+msgid ""
+"Wether or not argonaut server should get packages information from "
+"repositories at start and then once a day. Needed for FAI package list "
+"creation."
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+#: admin/systems/argonaut/class_argonautClient.inc:139
+msgid "Protocol"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:61
+#: admin/systems/argonaut/class_argonautClient.inc:139
+msgid "Protocol to use for argonaut"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:66
+msgid "Port"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:67
+msgid "Port on which the argonaut server will be listening"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:72
+msgid "Timeout"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:73
+msgid ""
+"Time in seconds before to consider an argonaut client or server as down"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:79
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Log directory"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:80
+msgid "Directory in which argonaut will store its log"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:87
+msgid "Wake on lan"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:90
+msgid "Interface"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:91
+msgid "Interface to use for sending WakeOnLan requests"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:96
+msgid "IP tool to use"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:103
+#: admin/systems/argonaut/class_argonautClient.inc:161
+msgid "SSL paths"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+#: admin/systems/argonaut/class_argonautClient.inc:164
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:106
+msgid "Path to the private key file on Argonaut server"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+#: admin/systems/argonaut/class_argonautClient.inc:169
+msgid "Certificate"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:111
+msgid "Path to the certificate file on Argonaut server"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+#: admin/systems/argonaut/class_argonautClient.inc:174
+msgid "CA certificate"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:116
+msgid "Path to the CA certificate file on Argonaut server"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+#: admin/systems/argonaut/class_argonautClient.inc:179
+msgid "CN of the certificate"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautServer.inc:121
+msgid "The CN in the server certificate"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
+msgid "Argonaut Fuse"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:31
+msgid "Argonaut Fuse settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:45
+msgid "Basic settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
+msgid "Default mode"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
+msgid "Directory in which argonaut-fuse will store its log"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
+msgid "TFTP"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
+msgid "Pxelinux cfg path"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
+msgid "Path where argonaut-fuse should store pxelinux.cfg"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:32
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
+msgid "Argonaut Fuse LTSP module settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:47
+msgid "LTSP"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:50
+msgid "LTSP server"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:29
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:30
+msgid "Argonaut Mirror settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
+msgid "Argonaut mirror settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
+msgid "Local Debian mirror directory"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:52
+msgid "Argonaut Debconf Crawler configuration"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
+msgid "Local packages folder"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
+msgid "Folder in which the crawler will store packages during analysis"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
+msgid "Argonaut Repository configuration"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
+msgid "Proxy"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
+msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
+msgid "Directory in which logs should be stored"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:76
+msgid "Ignore errors"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:77
+msgid ""
+"Causes debmirror to ignore missing or broken deb and source files but still "
+"be pedantic about checking meta files"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Source"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
+msgid "Include source in the mirror"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "GPG Check"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
+msgid "Fail if the Release.gpg file is missing"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
+msgid "Contents"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:93
+msgid ""
+"Additionally download Contents.<arch>.gz files (Note that these files can be"
+" relatively big and can change frequently)"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Verbose"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
+msgid "Wether to activate verbose mode"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
+msgid "Argonaut DNS settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:50
+msgid "Ldap2zone global settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
+msgid "Bind directory"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:53
+msgid "The directory in which conf file must be created"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
+msgid "Bind cache directory"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:58
+msgid "The directory in which zone files must be created"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:63
+msgid "TTL"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:64
+msgid "Time to live"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:72
+msgid "rndc path"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:73
+msgid "path to rndc binary"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
+msgid "Search base"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:79
+msgid ""
+"LDAP base in which ldap2zone should search. Only usefull if you got several "
+"nodes for the same zone."
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:85
+msgid "Ldap2zone master settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+msgid "Ignore reverse zone"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
+msgid "Do not write reverse zone"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+msgid "Notify"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+msgid "Allow update"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
+msgid "Allow update (semicolon separated and ended)"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+msgid "Allow transfer"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
+msgid "Allow transfer (semicolon separated and ended)"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
+msgid "Check names"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:105
+msgid ""
+"Cause any host name for the zone to be checked for compliance with RFC 952 "
+"and RFC 1123 and take the defined action"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+msgid "Ldap2zone slave settings"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "Manage DNS Slaves"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+msgid "zone"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
+msgid "DNS zone this server should be declared as slave of"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+msgid "master"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
+msgid "Master IP(s) for this zone"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
+msgid "reverses"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:129
+msgid "This server should be slave of reverses zones as well"
+msgstr ""
+
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:136
+msgid "DNS slaves"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:117
+msgid "Argonaut client"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:118
+msgid "Edit argonaut client settings"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:131
+msgid "Argonaut client settings"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Client port"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:134
+msgid "Port used by argonaut client for JSON-RPC"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "WakeOnLan interface"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:144
+msgid "Interface used by argonaut for WakeOnLan"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "TaskId file"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:149
+msgid "File which argonaut will use to store its task id when booting"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:154
+msgid "Directory in which argonaut client should write its logs"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:164
+msgid "Path to the private key file on Argonaut client"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:169
+msgid "Path to the certificate file on Argonaut client"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:174
+msgid "Path to the CA certificate file on Argonaut client"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:179
+msgid "The CN in this client certificate"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:185
+msgid "Service names"
+msgstr ""
+
+#: admin/systems/argonaut/class_argonautClient.inc:187
+msgid "Argonaut service names"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:33
+#: addons/argonaut/class_argonautImportFile.inc:36
+msgid "Argonaut task import"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:34
+msgid "Imports argonaut tasks from CSV file"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:49
+msgid "Import actions from CSV file"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:53
+msgid "Import a list of task into argonaut"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:63
+msgid "Upload"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:67
+msgid "Import file"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:72
+msgid "Imported tasks"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
+#: addons/argonaut/deploy-list.xml:79
+msgid "Import"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:122
+msgid "Fix the errors in your CSV file first"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:138
+msgid "Infrastructure service"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:145
+#, php-format
+msgid "Import complete: %s events successfully send, %s failed"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:157
+msgid "file is empty"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:182
+#: addons/argonaut/import_events.tpl.c:23
+msgid "MAC"
+msgstr ""
+
+#: addons/argonaut/class_argonautImportFile.inc:185
+#: addons/argonaut/deploy-list.xml:14 addons/argonaut/import_events.tpl.c:26
+msgid "Event"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:27
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Hours"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:32
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Minutes"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:37
+msgid "Seconds"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:53
+msgid "Date"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:58
+msgid "Time"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:81
+#: addons/argonaut/class_argonautAction.inc:84
+msgid "Argonaut task"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:82
+msgid "Schedule an argonaut task"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:97
+#: addons/argonaut/class_argonautAction.inc:107
+#: addons/argonaut/deploy-list.xml:51
+msgid "Schedule"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Periodical job"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:111
+msgid "Wether this job should repeat in time"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:115
+msgid "How often this task should be repeated"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Days"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Weeks"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:126
+msgid "Months"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:132
+#: addons/argonaut/deploy-list.xml:43
+msgid "Period"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:137
+msgid "Targets"
+msgstr ""
+
+#: addons/argonaut/class_argonautAction.inc:140
+msgid "Targets for this task"
+msgstr ""
+
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
+#: addons/argonaut/import_events.tpl.c:32
+msgid "Error"
+msgstr ""
+
+#: addons/argonaut/class_filterArgonautEvents.inc:39
+#, php-format
+msgid "Cannot load queue entries: %s"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:41
+#: addons/argonaut/class_argonautQueue.inc:46
+#: addons/argonaut/class_argonautQueue.inc:49
+msgid "Deployment queue"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:42
+msgid "Provide a mechanism to automatically activate systems"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:93
+msgid "Permission"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:123
+#: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
+msgid "Remove"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:124
+#, php-format
+msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:188
+msgid "Info"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:188
+#, php-format
+msgid "%s"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:214
+msgid "Error detail"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:256
+#, php-format
+msgid "Cannot update queue entries."
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:324
+msgid "immediately"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:336
+msgid "Waiting"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:339
+msgid "Show error"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:343
+msgid "Processed"
+msgstr ""
+
+#: addons/argonaut/class_argonautQueue.inc:352
+msgid "in progress"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:10
+msgid "List of queued jobs"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:27
+msgid "Target"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:35
+msgid "Task"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:59
+msgid "Status"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:67
+msgid "Actions"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
+msgid "Abort"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:108
+msgid "Execute"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:120
+msgid "Process now"
+msgstr ""
+
+#: addons/argonaut/deploy-list.xml:128
+msgid "View logs"
+msgstr ""
+
+#: addons/argonaut/class_argonautEventTypes.inc:67
+msgid "Switch off"
+msgstr ""
+
+#: addons/argonaut/class_argonautEventTypes.inc:80
+msgid "Reboot"
+msgstr ""
+
+#: addons/argonaut/class_argonautEventTypes.inc:84
+msgid "Wake up"
+msgstr ""
+
+#: addons/argonaut/class_argonautEventTypes.inc:88
+msgid "Software update"
+msgstr ""
+
+#: addons/argonaut/class_argonautEventTypes.inc:92
+msgid "(Re)Install"
+msgstr ""
+
+#: addons/argonaut/class_argonautEventTypes.inc:105
+msgid "Refresh slave files (ldap2zone)"
+msgstr ""
+
+#: addons/argonaut/import_events.tpl.c:2
+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 ""
+
+#: addons/argonaut/import_events.tpl.c:5
+msgid "timestamp"
+msgstr ""
+
+#: addons/argonaut/import_events.tpl.c:8
+msgid "MAC-address"
+msgstr ""
+
+#: addons/argonaut/import_events.tpl.c:11
+msgid "job type"
+msgstr ""
+
+#: addons/argonaut/import_events.tpl.c:14
+msgid "object group"
+msgstr ""
+
+#: addons/argonaut/import_events.tpl.c:17
+msgid "Available job types: %1"
+msgstr ""
+
+#: addons/argonaut/import_events.tpl.c:20
+msgid "Timestamp"
+msgstr ""
+
+#: addons/argonaut/import_events.tpl.c:29
+msgid "Object group"
+msgstr ""
diff --git a/audit/locale/af_ZA/fusiondirectory.po b/audit/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..e589be05ca23fffc636d0b1c7f8169d4d6860f45
--- /dev/null
+++ b/audit/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,139 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
+msgid "Audit event"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:58
+msgid "An event like ldap modification which was registered by audit plugin"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:76
+msgid "Event"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditManagement.inc:69
+msgid "Time"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:79
+msgid "Date and time this event happened"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditManagement.inc:83
+msgid "Action"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:82
+msgid "Action type"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditManagement.inc:76
+msgid "Author"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:83
+msgid "Action author"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:84
+msgid "Object type"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:85
+msgid "Object"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:85
+msgid "Target object"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:86
+msgid "Attributes"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:86
+msgid "Target attributes"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:87
+msgid "Result"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:87
+msgid "Result or error"
+msgstr ""
+
+#: admin/audit/class_auditManagement.inc:40
+#: config/audit/class_auditConfig.inc:41
+msgid "Audit"
+msgstr ""
+
+#: admin/audit/class_auditManagement.inc:41
+msgid "Audit events display"
+msgstr ""
+
+#: admin/audit/class_auditManagement.inc:90
+msgid "Type"
+msgstr ""
+
+#: admin/audit/class_auditManagement.inc:97
+msgid "Target"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr ""
diff --git a/audit/locale/ar/fusiondirectory.po b/audit/locale/ar/fusiondirectory.po
index 09fb8b85dcc85c129dac01106ffd09e32563183b..3e6c8cc5014d60fd22ff05615dd324c52cb8f437 100644
--- a/audit/locale/ar/fusiondirectory.po
+++ b/audit/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
@@ -18,70 +18,75 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/ca/fusiondirectory.po b/audit/locale/ca/fusiondirectory.po
index 6ced115ec174dd9ff43bde4d9c951f8bc6e67ccc..5f64cd0aaa4a72830e8fee48537f43a8ff1a3d2c 100644
--- a/audit/locale/ca/fusiondirectory.po
+++ b/audit/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
@@ -18,70 +18,75 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr "Objecte"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/cs_CZ/fusiondirectory.po b/audit/locale/cs_CZ/fusiondirectory.po
index 0b6109baf3423b8ad3048539cff81c07c2300b06..6843fe1323ec9b75abb784ce59b40586bef885f5 100644
--- a/audit/locale/cs_CZ/fusiondirectory.po
+++ b/audit/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,73 +16,78 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr "Neznámý uživatel: %s"
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr "Auditní událost"
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 "Úprava-událost v LDAP která byla zaznamenána auditním zásuvným modulem"
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr "Událost"
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr "ÄŒas"
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "Akce"
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr "Typ objektu"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr "Objekt"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr "Cílový objekt"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr "Atributy"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr "Výsledek"
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/de/fusiondirectory.po b/audit/locale/de/fusiondirectory.po
index 921d4f8953b5e3360e9b54387c21be01a021fcf2..4be56d3f4751ce4ed7144007338fb91349e13a69 100644
--- a/audit/locale/de/fusiondirectory.po
+++ b/audit/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
@@ -18,70 +18,75 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr "Audit-Ereignis"
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr "Ereignis"
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr "Zeit"
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "Aktion"
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr "Autor"
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr "Objecttyp"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr "Objekt"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr "Zielobjekt"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr "Attribute"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr "Zielattribute"
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr "Ergebnis"
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 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 80a5289caedfba0d6fda96c2579ff5a8b1b77c95..488640674c334b4efea2bf4d8053672aa49e8263 100644
--- a/audit/locale/el_GR/fusiondirectory.po
+++ b/audit/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
@@ -18,70 +18,75 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "Ενέργεια"
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr "Τύπος αντικειμένου"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr "Αντικείμενο"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/es/fusiondirectory.po b/audit/locale/es/fusiondirectory.po
index beb808c9a93bf38c71e93409d154cf39512e2f07..906739d4c9ee5e3d00a9afc2725b2e67bc0659e8 100644
--- a/audit/locale/es/fusiondirectory.po
+++ b/audit/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
@@ -18,70 +18,75 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr "Evento"
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr "Tiempo"
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "Acción"
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr "Objeto"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/es_CO/fusiondirectory.po b/audit/locale/es_CO/fusiondirectory.po
index 10da035a474f84037eb119e669576bba641c0ec5..3342313d79825553ce267633a1d2cd90a39794e2 100644
--- a/audit/locale/es_CO/fusiondirectory.po
+++ b/audit/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
@@ -18,70 +18,75 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr "Objeto"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/es_VE/fusiondirectory.po b/audit/locale/es_VE/fusiondirectory.po
index a01839c98445dd61a0ba514deccd40e4ac811512..f0d67b2072ff3805a441d178fde0e5d7d5aa3f2c 100644
--- a/audit/locale/es_VE/fusiondirectory.po
+++ b/audit/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
@@ -18,70 +18,75 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr "Evento"
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr "Tiempo"
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "Acción"
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr "Objeto"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/fa_IR/fusiondirectory.po b/audit/locale/fa_IR/fusiondirectory.po
index 83a2971c8d1463aae18d51f24eab2e54739f9cfb..1ca794369a4c885b3df413688e455021adb5ee7b 100644
--- a/audit/locale/fa_IR/fusiondirectory.po
+++ b/audit/locale/fa_IR/fusiondirectory.po
@@ -8,79 +8,84 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/fi_FI/fusiondirectory.po b/audit/locale/fi_FI/fusiondirectory.po
index 4ad91589bd0092a294159d3e7b809e079f9a30e2..1bb939d578433bd07ece53f7b26c943b86ee6dc3 100644
--- a/audit/locale/fi_FI/fusiondirectory.po
+++ b/audit/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
@@ -18,70 +18,75 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr "Aika"
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr "Tapahtuman päivämäärä ja kellonaika"
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "Toiminto"
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr "Toimintotyyppi"
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr "Tekijä"
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr "Toiminnon tekijä"
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr "Ominaisuudet"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr "Lopputulos"
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr "Lopputulos tai virhe"
 
diff --git a/audit/locale/fr/fusiondirectory.po b/audit/locale/fr/fusiondirectory.po
index 184bd56e419fe9a453db6423f2502cd7f249c151..859bcfe112916c407d9ace6fc99276c0b7fd28e2 100644
--- a/audit/locale/fr/fusiondirectory.po
+++ b/audit/locale/fr/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2018\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,72 +18,77 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr "Utilisateur inconnu : %s"
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr "Événement d'audit"
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 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"
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr "Évènement"
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr "Temps"
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr "Date et heure à laquelle cet évènement est arrivé"
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "Action"
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr "Type d'action"
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr "Auteur"
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr "Auteur de l'action"
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr "Type d'objet"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr "Objet"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr "Objet cible"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr "Attributs"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr "Attributs cibles"
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr "Résultat"
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr "Résultat ou erreur"
 
diff --git a/audit/locale/hu_HU/fusiondirectory.po b/audit/locale/hu_HU/fusiondirectory.po
index 1de2b89c71bf593f149a345e3c57de891692c7f9..ac969efd716d9a8df65606e745f73974e7e9e490 100644
--- a/audit/locale/hu_HU/fusiondirectory.po
+++ b/audit/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -17,70 +17,75 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/id/fusiondirectory.po b/audit/locale/id/fusiondirectory.po
index 4de1cf3596e67e8639e796d8a914e29e23539315..49ee0435d4dd3aa005ecea3ee0e74eb929d6766c 100644
--- a/audit/locale/id/fusiondirectory.po
+++ b/audit/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
@@ -17,70 +17,75 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/it_IT/fusiondirectory.po b/audit/locale/it_IT/fusiondirectory.po
index f403b7dc8349cef7269c31df6ce31ba190098fec..3fb9fcecac4eeb6588da073c1233c2b4a1d50cdd 100644
--- a/audit/locale/it_IT/fusiondirectory.po
+++ b/audit/locale/it_IT/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2018\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,72 +18,77 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr "Utente sconosciuto : %s"
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr "Evento di controllo"
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 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"
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr "Evento"
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr "Tempo"
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr "Data e ora in cui questo evento é accaduto"
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "Azione"
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr "Tipo di azione"
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr "Autore"
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr "Azione autore"
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr "Tipo di oggetto"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr "Oggetto"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr "Oggetto di destinazione"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr "Attributi"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr "Attributi di destinazione"
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr "Risultato"
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr "Risultato o errore"
 
diff --git a/audit/locale/ja/fusiondirectory.po b/audit/locale/ja/fusiondirectory.po
index c31addcc52180ff69b1c6e5a2fe09b9c0fed8740..0d216d46d337012b9fee66e51fe53ea822fdf51a 100644
--- a/audit/locale/ja/fusiondirectory.po
+++ b/audit/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -17,70 +17,75 @@ msgstr ""
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/ko/fusiondirectory.po b/audit/locale/ko/fusiondirectory.po
index 463d584e3ec6dabe0e104a15fc1779b4adcff206..7dec1b7b0b2cbee8ccde332f6f91b5a7d46d57a1 100644
--- a/audit/locale/ko/fusiondirectory.po
+++ b/audit/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
@@ -18,70 +18,75 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr "알 수없는 사용자 : %s"
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr "감사 이벤트"
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr "감사 플러그인에 의해 등록된 LDAP 변경 등의 이벤트"
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr "이벤트"
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr "시간"
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr "이벤트가 발생한 날짜와 시간"
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "ì•¡ì…˜"
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr "액션 타입"
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr "작성자"
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr "액션 작성자"
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr "오브젝트 타입"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr "오브젝트"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr "타겟 오브젝트"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr "속성"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr "타겟 속성"
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr "ê²°ê³¼"
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr "결과 또는 오류"
 
diff --git a/audit/locale/lv/fusiondirectory.po b/audit/locale/lv/fusiondirectory.po
index 51f191da6deace37d22f3530f7c944fef5509fa2..0eae9231a7a36f922a9f59f9dfbceaf7e04c6c5d 100644
--- a/audit/locale/lv/fusiondirectory.po
+++ b/audit/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
@@ -18,70 +18,75 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/nb/fusiondirectory.po b/audit/locale/nb/fusiondirectory.po
index 3acd898a1118c1d3d16030b76278d6bef0f3a75c..eb5198b38742bf13136950d79bb6497704ad42e8 100644
--- a/audit/locale/nb/fusiondirectory.po
+++ b/audit/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -17,70 +17,75 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/nl/fusiondirectory.po b/audit/locale/nl/fusiondirectory.po
index 72f6773af37e6c0a0d025606463df895fb74f6e8..4cae962554cb61cdcfca6b1c50dfeaa50b48bda0 100644
--- a/audit/locale/nl/fusiondirectory.po
+++ b/audit/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Lucien Antonissen <lucien.antonissen@digipolis.be>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
@@ -18,70 +18,75 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr "Audit event"
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr "Event"
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr "Tijd"
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "Actie"
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr "Auteur"
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr "Object type"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr "Object"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr "Attributen"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr "Resultaat"
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/pl/fusiondirectory.po b/audit/locale/pl/fusiondirectory.po
index 6af23e74b4366a10b38b040bb51fdb11f1131f57..cb7fa9bd6a4df951aa7aeaef4d9a743b38ae7a25 100644
--- a/audit/locale/pl/fusiondirectory.po
+++ b/audit/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -18,70 +18,75 @@ msgstr ""
 "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/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "Akcja"
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr "Obiekt"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/pt/fusiondirectory.po b/audit/locale/pt/fusiondirectory.po
index 337085cbb7b5b7e42379b32705d80df65b337414..4f348c78d338d36aa6780468df40d396b80f7799 100644
--- a/audit/locale/pt/fusiondirectory.po
+++ b/audit/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
@@ -18,70 +18,75 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr "Objeto"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/pt_BR/fusiondirectory.po b/audit/locale/pt_BR/fusiondirectory.po
index 3772e35a90cd1ca4175cded7a98ff4c94dfe65bc..d1c24cd94241163129e02dc3876b9062b2352d73 100644
--- a/audit/locale/pt_BR/fusiondirectory.po
+++ b/audit/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
@@ -18,70 +18,75 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr "Evento"
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "Ação"
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr "Objeto"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/ru/fusiondirectory.po b/audit/locale/ru/fusiondirectory.po
index 254d8520328b3e945a6ebaaf70ddddcfa50451ed..a1f67fea82ee263ff2a9de3dd9d84ada81023183 100644
--- a/audit/locale/ru/fusiondirectory.po
+++ b/audit/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
@@ -18,70 +18,75 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "Действие"
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr "Тип объекта"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr "Объект"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/ru@petr1708/fusiondirectory.po b/audit/locale/ru@petr1708/fusiondirectory.po
index aa4c74e4dccbd8c550953b9ce25c422cc882d945..cdb8d5ec22fc581eb31a698df7a37942f2d08f77 100644
--- a/audit/locale/ru@petr1708/fusiondirectory.po
+++ b/audit/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -17,70 +17,75 @@ msgstr ""
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/sv/fusiondirectory.po b/audit/locale/sv/fusiondirectory.po
index 3251ecaca2622697373603f737e8eacfe58ec17c..7d37146ba1fe35fe675cad348b6889d3e90e7c5d 100644
--- a/audit/locale/sv/fusiondirectory.po
+++ b/audit/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
@@ -18,70 +18,75 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "Åtgärd"
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr "Objekt"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/tr_TR/fusiondirectory.po b/audit/locale/tr_TR/fusiondirectory.po
index d003f764545bce12e4f6ea53b4fd2bc5acc1d349..8fc25d8ceea089f51bccbdd996fc8895266f4966 100644
--- a/audit/locale/tr_TR/fusiondirectory.po
+++ b/audit/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
@@ -17,70 +17,75 @@ msgstr ""
 "Language: tr_TR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/ug/fusiondirectory.po b/audit/locale/ug/fusiondirectory.po
index 6dbafe28a1db1457ebf90fd9809d7cd0876fb371..3030d0eb566e7fa5726c17ce79c6687933377c70 100644
--- a/audit/locale/ug/fusiondirectory.po
+++ b/audit/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -17,70 +17,75 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/vi_VN/fusiondirectory.po b/audit/locale/vi_VN/fusiondirectory.po
index 37a9c3235d892687f35e8450f3d7ee626390a7eb..1b52bc211d03ec2627839f90fde081213ad5c502 100644
--- a/audit/locale/vi_VN/fusiondirectory.po
+++ b/audit/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
@@ -18,70 +18,75 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr "đối tượng"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/zh/fusiondirectory.po b/audit/locale/zh/fusiondirectory.po
index 8e450085fc797e84f811fe0881db8f38cd4b2c0c..0cddf7ee38f2f95596ed2cc074346cdaac9d247a 100644
--- a/audit/locale/zh/fusiondirectory.po
+++ b/audit/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
@@ -18,70 +18,75 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/audit/class_auditEvent.inc:53 admin/audit/class_auditEvent.inc:56
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
 msgid "Audit event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:54
+#: admin/audit/class_auditEvent.inc:58
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:72
+#: admin/audit/class_auditEvent.inc:76
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:75
+#: admin/audit/class_auditEvent.inc:79
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "行动"
 
-#: admin/audit/class_auditEvent.inc:78
+#: admin/audit/class_auditEvent.inc:82
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:83
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:84
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Object"
 msgstr "对象"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:85
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:86
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:87
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/zh_TW/fusiondirectory.po b/audit/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..ac159b231b07a4dd29402d9cc592ccf574b87571
--- /dev/null
+++ b/audit/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,139 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/audit/class_auditEvent.inc:43
+#, php-format
+msgid "Unknown user: %s"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:57 admin/audit/class_auditEvent.inc:60
+msgid "Audit event"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:58
+msgid "An event like ldap modification which was registered by audit plugin"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:76
+msgid "Event"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditManagement.inc:69
+msgid "Time"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:79
+msgid "Date and time this event happened"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditManagement.inc:83
+msgid "Action"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:82
+msgid "Action type"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditManagement.inc:76
+msgid "Author"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:83
+msgid "Action author"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:84
+msgid "Object type"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:85
+msgid "Object"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:85
+msgid "Target object"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:86
+msgid "Attributes"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:86
+msgid "Target attributes"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:87
+msgid "Result"
+msgstr ""
+
+#: admin/audit/class_auditEvent.inc:87
+msgid "Result or error"
+msgstr ""
+
+#: admin/audit/class_auditManagement.inc:40
+#: config/audit/class_auditConfig.inc:41
+msgid "Audit"
+msgstr ""
+
+#: admin/audit/class_auditManagement.inc:41
+msgid "Audit events display"
+msgstr ""
+
+#: admin/audit/class_auditManagement.inc:90
+msgid "Type"
+msgstr ""
+
+#: admin/audit/class_auditManagement.inc:97
+msgid "Target"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:28
+msgid "Audit configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:29
+msgid "FusionDirectory audit plugin configuration"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Audit RDN"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:44
+msgid "Branch in which audit events will be stored"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Actions to audit"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:50
+msgid "Which actions should be stored in LDAP audit log"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Days to keep"
+msgstr ""
+
+#: config/audit/class_auditConfig.inc:57
+msgid "Number of days of audit to keep in the LDAP when cleaning"
+msgstr ""
diff --git a/autofs/locale/af_ZA/fusiondirectory.po b/autofs/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..e6561dfee115f4ef81d6b85c2815d5907dfb8d7a
--- /dev/null
+++ b/autofs/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,86 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/autofs/class_autofsManagement.inc:31
+msgid "Auto fs"
+msgstr ""
+
+#: admin/autofs/class_autofsManagement.inc:32
+msgid "Auto fs management"
+msgstr ""
+
+#: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
+#: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:54
+msgid "Directory"
+msgstr ""
+
+#: admin/autofs/class_nisObject.inc:58 admin/autofs/class_nisMap.inc:53
+msgid "Name"
+msgstr ""
+
+#: admin/autofs/class_nisObject.inc:58
+msgid "Name of this directory"
+msgstr ""
+
+#: admin/autofs/class_nisObject.inc:64
+msgid "Automount entry"
+msgstr ""
+
+#: admin/autofs/class_nisObject.inc:64
+msgid ""
+"The entry of this directory for the automount daemon.\n"
+" For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
+msgstr ""
+
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
+msgid "Mount point"
+msgstr ""
+
+#: admin/autofs/class_nisObject.inc:68
+msgid "The mount point this directory will be placed in"
+msgstr ""
+
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
+msgstr ""
+
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr ""
diff --git a/autofs/locale/ar/fusiondirectory.po b/autofs/locale/ar/fusiondirectory.po
index a35318394b12e056ce7a0bb4fc081098d8cc551a..3c006708705c3f7a714ac459341e37be407dedac 100644
--- a/autofs/locale/ar/fusiondirectory.po
+++ b/autofs/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/autofs/locale/ca/fusiondirectory.po b/autofs/locale/ca/fusiondirectory.po
index 5d29fcbeeb0645bed91c09db2fa8861f1fe5ec7c..6bb38ec1673c3d4b149e4cc27c7f274bacdc5d6a 100644
--- a/autofs/locale/ca/fusiondirectory.po
+++ b/autofs/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/autofs/locale/cs_CZ/fusiondirectory.po b/autofs/locale/cs_CZ/fusiondirectory.po
index 784f21b07933f1e1647f510d69282440baf14967..00152eb1322abcd3b56d4abbff5fbd988e7fdacd 100644
--- a/autofs/locale/cs_CZ/fusiondirectory.po
+++ b/autofs/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
diff --git a/autofs/locale/de/fusiondirectory.po b/autofs/locale/de/fusiondirectory.po
index 441342f56d0ac26a401b59a7517f5425694093ca..7db2acdbae2a08d888223fc8016ad7fb99a1bcbb 100644
--- a/autofs/locale/de/fusiondirectory.po
+++ b/autofs/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/autofs/locale/el_GR/fusiondirectory.po b/autofs/locale/el_GR/fusiondirectory.po
index 75c7d3845b172848e6bc1b41b70483586a79a249..b8cc6d835eedacf121b80d4e1c85b3b8a7838694 100644
--- a/autofs/locale/el_GR/fusiondirectory.po
+++ b/autofs/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/autofs/locale/es/fusiondirectory.po b/autofs/locale/es/fusiondirectory.po
index fc38f249bcafc4033827398b4ca88796501d7ac4..7073fb940f536ad307003dbc181e2eda1dca8295 100644
--- a/autofs/locale/es/fusiondirectory.po
+++ b/autofs/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/autofs/locale/es_CO/fusiondirectory.po b/autofs/locale/es_CO/fusiondirectory.po
index 318830895366201a7ad905326c9de12e8adf2a77..227be6ac0fe620ac90d45a8185de04516faea4f8 100644
--- a/autofs/locale/es_CO/fusiondirectory.po
+++ b/autofs/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/autofs/locale/es_VE/fusiondirectory.po b/autofs/locale/es_VE/fusiondirectory.po
index 5d113d7f9cfdce8e76757fa5961691aad71ccaef..5367f6dd043089db9871d3c58a07fa9e49658935 100644
--- a/autofs/locale/es_VE/fusiondirectory.po
+++ b/autofs/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/autofs/locale/fa_IR/fusiondirectory.po b/autofs/locale/fa_IR/fusiondirectory.po
index 7d8f55bfb380f7dc7c983a225e50c0c7121308f5..8f0ae3a860cf48cbdd977e8d277f776b0d0b6766 100644
--- a/autofs/locale/fa_IR/fusiondirectory.po
+++ b/autofs/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
diff --git a/autofs/locale/fi_FI/fusiondirectory.po b/autofs/locale/fi_FI/fusiondirectory.po
index 448056edae2bcd565353200b8035a32b983b8715..76b8059a0fa84640a799997b9e799583ad9ddcdf 100644
--- a/autofs/locale/fi_FI/fusiondirectory.po
+++ b/autofs/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/autofs/locale/fr/fusiondirectory.po b/autofs/locale/fr/fusiondirectory.po
index b28873486cc1d63fc6294c9528aa596c386dc003..5fe3c9bf9118ac040b01a8ca0c2ad288527fdb19 100644
--- a/autofs/locale/fr/fusiondirectory.po
+++ b/autofs/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/autofs/locale/hu_HU/fusiondirectory.po b/autofs/locale/hu_HU/fusiondirectory.po
index ecd9fbfb50608f8271d86ba8d77ec3bba9680753..0bead696b316d70b08a4497feed3d290801e8b7c 100644
--- a/autofs/locale/hu_HU/fusiondirectory.po
+++ b/autofs/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/autofs/locale/id/fusiondirectory.po b/autofs/locale/id/fusiondirectory.po
index fd09d7ffd771b995168c791f12589d11d48f0bbd..971a8b8d7c51e8f5ac030f3ede9448dc1d568b82 100644
--- a/autofs/locale/id/fusiondirectory.po
+++ b/autofs/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/autofs/locale/it_IT/fusiondirectory.po b/autofs/locale/it_IT/fusiondirectory.po
index 0b1ec64e426fc79656613d59639c8008b2ec6fea..3571218c89d35b0c0b538b44989b75857495f8d8 100644
--- a/autofs/locale/it_IT/fusiondirectory.po
+++ b/autofs/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/autofs/locale/ja/fusiondirectory.po b/autofs/locale/ja/fusiondirectory.po
index 5acc4dbe1b7629334d81968df1b25a886c2df1bf..ff89105cdcf8c81e199f9f1ae6fe536d10d82672 100644
--- a/autofs/locale/ja/fusiondirectory.po
+++ b/autofs/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/autofs/locale/ko/fusiondirectory.po b/autofs/locale/ko/fusiondirectory.po
index 59f1cd860f303b6b2ab1db354131399152019372..e0956ccfdd0fadbea24bfdb1d2390ea7f3988ca0 100644
--- a/autofs/locale/ko/fusiondirectory.po
+++ b/autofs/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/autofs/locale/lv/fusiondirectory.po b/autofs/locale/lv/fusiondirectory.po
index 680301bad17a68fc8251113f6fb7df3dbd9caad4..9ba0c5e93a6bbdf9679e88cb72f81804518f3355 100644
--- a/autofs/locale/lv/fusiondirectory.po
+++ b/autofs/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/autofs/locale/nb/fusiondirectory.po b/autofs/locale/nb/fusiondirectory.po
index 6227c7292688ec0136046e6a5cf8fccc8ab60ad4..527250c3949c9dac5a5937b7ae625f7b2bffe959 100644
--- a/autofs/locale/nb/fusiondirectory.po
+++ b/autofs/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/autofs/locale/nl/fusiondirectory.po b/autofs/locale/nl/fusiondirectory.po
index 1cacca9dc4c1754ca2abd95914fb447ae87290c3..3067b674a745b52f3779f6ee4a9c88327046015c 100644
--- a/autofs/locale/nl/fusiondirectory.po
+++ b/autofs/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Lucien Antonissen <lucien.antonissen@digipolis.be>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/autofs/locale/pl/fusiondirectory.po b/autofs/locale/pl/fusiondirectory.po
index 04f7377219f35c0953b45989e57d957525481539..1dc230c23e3a4fb363ca672b6628872fc11b5685 100644
--- a/autofs/locale/pl/fusiondirectory.po
+++ b/autofs/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/autofs/locale/pt/fusiondirectory.po b/autofs/locale/pt/fusiondirectory.po
index 3146c240121e9445170265e1cf40f371adddf2aa..fe4d648d628f08450721bc6a280d5d19cbf67fff 100644
--- a/autofs/locale/pt/fusiondirectory.po
+++ b/autofs/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/autofs/locale/pt_BR/fusiondirectory.po b/autofs/locale/pt_BR/fusiondirectory.po
index 0f441486a706a320d0b1450d7cedf81d2101d58f..4245f4152d2d6f825fa368e078002f699f738cba 100644
--- a/autofs/locale/pt_BR/fusiondirectory.po
+++ b/autofs/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/autofs/locale/ru/fusiondirectory.po b/autofs/locale/ru/fusiondirectory.po
index b24db1c5ffbbaa86abcc3849c6a5007e9f3cfdd5..78496ffced9f0f1ca3fa282aca007b85b56b363f 100644
--- a/autofs/locale/ru/fusiondirectory.po
+++ b/autofs/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/autofs/locale/ru@petr1708/fusiondirectory.po b/autofs/locale/ru@petr1708/fusiondirectory.po
index 419c6b09a2b2791f59d4509c776206b14d9639ae..2fca75efff914e692401ad88b3b4289996dcbaad 100644
--- a/autofs/locale/ru@petr1708/fusiondirectory.po
+++ b/autofs/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/autofs/locale/sv/fusiondirectory.po b/autofs/locale/sv/fusiondirectory.po
index ba39d45b7ffc23ffd9b297bf8d42bbb5def83040..7c00b0efeb9449b14f0202a7fe5d5fb12d7b7296 100644
--- a/autofs/locale/sv/fusiondirectory.po
+++ b/autofs/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/autofs/locale/tr_TR/fusiondirectory.po b/autofs/locale/tr_TR/fusiondirectory.po
index ea3b52226770098868c52cccc630cd8faa92d2b4..76c9154db7b0c59d5290557440ae5a0af5331b8f 100644
--- a/autofs/locale/tr_TR/fusiondirectory.po
+++ b/autofs/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/autofs/locale/ug/fusiondirectory.po b/autofs/locale/ug/fusiondirectory.po
index 6d0534ce8e70d00f3365a169c7f172d265cbba9a..11bf72dc027700c1787cba7f8ecfa94bc926a858 100644
--- a/autofs/locale/ug/fusiondirectory.po
+++ b/autofs/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/autofs/locale/vi_VN/fusiondirectory.po b/autofs/locale/vi_VN/fusiondirectory.po
index d727c726b525badb7c1fc9b7c49f897b4ad53e77..dcb1a53361f7e974390fc32289b7ca020761cf45 100644
--- a/autofs/locale/vi_VN/fusiondirectory.po
+++ b/autofs/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/autofs/locale/zh/fusiondirectory.po b/autofs/locale/zh/fusiondirectory.po
index 8797c4a9c3ba8f10bd5851934e6d90723f73eb8c..dddf488562f1a85483fa150f2316ff8e12e72fcd 100644
--- a/autofs/locale/zh/fusiondirectory.po
+++ b/autofs/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/autofs/locale/zh_TW/fusiondirectory.po b/autofs/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..a6280506a7e6f64f2f24f905207f37e264284168
--- /dev/null
+++ b/autofs/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,86 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/autofs/class_autofsManagement.inc:31
+msgid "Auto fs"
+msgstr ""
+
+#: admin/autofs/class_autofsManagement.inc:32
+msgid "Auto fs management"
+msgstr ""
+
+#: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
+#: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:54
+msgid "Directory"
+msgstr ""
+
+#: admin/autofs/class_nisObject.inc:58 admin/autofs/class_nisMap.inc:53
+msgid "Name"
+msgstr ""
+
+#: admin/autofs/class_nisObject.inc:58
+msgid "Name of this directory"
+msgstr ""
+
+#: admin/autofs/class_nisObject.inc:64
+msgid "Automount entry"
+msgstr ""
+
+#: admin/autofs/class_nisObject.inc:64
+msgid ""
+"The entry of this directory for the automount daemon.\n"
+" For instance 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
+msgstr ""
+
+#: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
+#: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
+msgid "Mount point"
+msgstr ""
+
+#: admin/autofs/class_nisObject.inc:68
+msgid "The mount point this directory will be placed in"
+msgstr ""
+
+#: admin/autofs/class_nisMap.inc:32
+msgid "Autofs mount point"
+msgstr ""
+
+#: admin/autofs/class_nisMap.inc:53
+msgid "Name of the mount point"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:28
+msgid "Autofs configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:29
+msgid "FusionDirectory autofs plugin configuration"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:42
+msgid "AutoFS"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "AutoFS RDN"
+msgstr ""
+
+#: config/autofs/class_autofsConfig.inc:45
+msgid "Branch in which automount info will be stored"
+msgstr ""
diff --git a/certificates/locale/af_ZA/fusiondirectory.po b/certificates/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..07ef1318fa2c25a4a748d80e5c13c0289feae004
--- /dev/null
+++ b/certificates/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,40 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/certificates/class_userCertificates.inc:31
+#: personal/certificates/class_userCertificates.inc:32
+msgid "Download"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:75
+msgid "Unknown format"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
+msgid "Certificates"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:118
+msgid "User certificates"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:136
+msgid "Certificate content"
+msgstr ""
diff --git a/certificates/locale/ar/fusiondirectory.po b/certificates/locale/ar/fusiondirectory.po
index e0454d1ef9b8409bcc110f124bbb501d82cf9bfb..83ca8d27adace8f6984a0c8e1f2fd4a3b2c1ad03 100644
--- a/certificates/locale/ar/fusiondirectory.po
+++ b/certificates/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/certificates/locale/ca/fusiondirectory.po b/certificates/locale/ca/fusiondirectory.po
index e4ad14d124862913f8dbc5997c66862ae1e08a56..4c5d058edf43fc3b15683043bf42ca62b73ba6de 100644
--- a/certificates/locale/ca/fusiondirectory.po
+++ b/certificates/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/certificates/locale/cs_CZ/fusiondirectory.po b/certificates/locale/cs_CZ/fusiondirectory.po
index 5b884d172a95c3c5258494064b097091bcb583d5..32085647c43df41aaa251c6f6bf19d9865305e1c 100644
--- a/certificates/locale/cs_CZ/fusiondirectory.po
+++ b/certificates/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: personal/certificates/class_userCertificates.inc:31
 #: personal/certificates/class_userCertificates.inc:32
diff --git a/certificates/locale/de/fusiondirectory.po b/certificates/locale/de/fusiondirectory.po
index 7f317f439983d35b7dcaa501e8317c5c033c7b22..b5104e05ce7ea603b8c8a4f9901743999e8f4304 100644
--- a/certificates/locale/de/fusiondirectory.po
+++ b/certificates/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/certificates/locale/el_GR/fusiondirectory.po b/certificates/locale/el_GR/fusiondirectory.po
index 972d2ebe5846fd7a464c06e4b1b97d30a8951eae..a168b8adbf9c2d9b4e2e61f45a2d63ea359a2eb7 100644
--- a/certificates/locale/el_GR/fusiondirectory.po
+++ b/certificates/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/certificates/locale/es/fusiondirectory.po b/certificates/locale/es/fusiondirectory.po
index 7f0a9be23aef224a12cd7161ae871c7905d8d81c..02748c18bb3c6765c298c5b78122904785bdb43b 100644
--- a/certificates/locale/es/fusiondirectory.po
+++ b/certificates/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/certificates/locale/es_CO/fusiondirectory.po b/certificates/locale/es_CO/fusiondirectory.po
index 455b736d37b12d3e7895cdc101fdd6d24b503975..81f5eb70e3b420cb005878ea3c4c9261e5b8799c 100644
--- a/certificates/locale/es_CO/fusiondirectory.po
+++ b/certificates/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/certificates/locale/es_VE/fusiondirectory.po b/certificates/locale/es_VE/fusiondirectory.po
index 4a70038c2d1f8a241141ca37afbfc51a2c0ea4c1..8ead97e379f8af244a56efa4eb1387e6a7215f03 100644
--- a/certificates/locale/es_VE/fusiondirectory.po
+++ b/certificates/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/certificates/locale/fa_IR/fusiondirectory.po b/certificates/locale/fa_IR/fusiondirectory.po
index c69b7578af5444e4de676fd1b24d05813b65126e..75a1a873e11ecdf04c1868e5cf843b2f09ce7dbe 100644
--- a/certificates/locale/fa_IR/fusiondirectory.po
+++ b/certificates/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: personal/certificates/class_userCertificates.inc:31
 #: personal/certificates/class_userCertificates.inc:32
diff --git a/certificates/locale/fi_FI/fusiondirectory.po b/certificates/locale/fi_FI/fusiondirectory.po
index 4f2e889749e34f70b9b1c3b45987095eacd2f269..1f97cf1a78f7b17a6d23b5a1911946d3bee892df 100644
--- a/certificates/locale/fi_FI/fusiondirectory.po
+++ b/certificates/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/certificates/locale/fr/fusiondirectory.po b/certificates/locale/fr/fusiondirectory.po
index de6eb8d99314b69c7b68df62ee2d098e6fffdbe1..deff2eec6ad8cc5df8a229ac25080934e24f72e7 100644
--- a/certificates/locale/fr/fusiondirectory.po
+++ b/certificates/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/certificates/locale/hu_HU/fusiondirectory.po b/certificates/locale/hu_HU/fusiondirectory.po
index fbfc9136990cd79d00b3ec96a35d074fd2688ccb..4936b90a4d09177630dba253a16a77d04207a57d 100644
--- a/certificates/locale/hu_HU/fusiondirectory.po
+++ b/certificates/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/certificates/locale/id/fusiondirectory.po b/certificates/locale/id/fusiondirectory.po
index 63ad21a42fcee8e5214b131237d9ddac7edeae8b..d7c0848f4ee2b6a6be0de5e2595feee6bf5d73e3 100644
--- a/certificates/locale/id/fusiondirectory.po
+++ b/certificates/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/certificates/locale/it_IT/fusiondirectory.po b/certificates/locale/it_IT/fusiondirectory.po
index 5400625380db7bd1428710426c3ad55bcc48375d..d80b95510faa26978b35f876111496180c6a280e 100644
--- a/certificates/locale/it_IT/fusiondirectory.po
+++ b/certificates/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/certificates/locale/ja/fusiondirectory.po b/certificates/locale/ja/fusiondirectory.po
index 381aafa4bbdb057f62168ef912c306a37f2303b5..c43057c5b0744534e2020d61c9b54f27f1f03d5b 100644
--- a/certificates/locale/ja/fusiondirectory.po
+++ b/certificates/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/certificates/locale/ko/fusiondirectory.po b/certificates/locale/ko/fusiondirectory.po
index d60d6fa0578ac9ce6cfe58950199d0b89f469d3e..97ea0b352e5f3519fa3fc709ecc1e7815f7d1bab 100644
--- a/certificates/locale/ko/fusiondirectory.po
+++ b/certificates/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/certificates/locale/lv/fusiondirectory.po b/certificates/locale/lv/fusiondirectory.po
index c5456cecfbd882e7631a5a918246dc891ed655b0..3313e66f33a2301d1f14db4157addea4d4e126ec 100644
--- a/certificates/locale/lv/fusiondirectory.po
+++ b/certificates/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/certificates/locale/nb/fusiondirectory.po b/certificates/locale/nb/fusiondirectory.po
index 6341e31e09650536181e0d5d7d7990a1f7095b30..8378bf240c78ac70157c4f8724d9559046bb1a02 100644
--- a/certificates/locale/nb/fusiondirectory.po
+++ b/certificates/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/certificates/locale/nl/fusiondirectory.po b/certificates/locale/nl/fusiondirectory.po
index 8b88bc8a251d774b7a7369a7f51d69e9e556b398..87f21b2748415bb428de0de98c5612915e179978 100644
--- a/certificates/locale/nl/fusiondirectory.po
+++ b/certificates/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/certificates/locale/pl/fusiondirectory.po b/certificates/locale/pl/fusiondirectory.po
index ab82a8bb6cbbd5c1546240e34ccba9901b1aa384..bd6809bee6797697063cf3c3f0fc2a14ceca5794 100644
--- a/certificates/locale/pl/fusiondirectory.po
+++ b/certificates/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/certificates/locale/pt/fusiondirectory.po b/certificates/locale/pt/fusiondirectory.po
index ea7db5830af1d449e0d0bb3928f198e98e639980..a6e3ba44dcd28c82b6a9f6a5f8bf39a9c4e785a6 100644
--- a/certificates/locale/pt/fusiondirectory.po
+++ b/certificates/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/certificates/locale/pt_BR/fusiondirectory.po b/certificates/locale/pt_BR/fusiondirectory.po
index fb4cd69ce905e3ff24584ff13859a53849b5a435..d2102465d1b528936ebf1cd51d24961702cce006 100644
--- a/certificates/locale/pt_BR/fusiondirectory.po
+++ b/certificates/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/certificates/locale/ru/fusiondirectory.po b/certificates/locale/ru/fusiondirectory.po
index 866ef42c5b191e2137362c58a463d104542add59..0fe0d7e1dc4d71c4317986e2e0d3aa5569e60d7a 100644
--- a/certificates/locale/ru/fusiondirectory.po
+++ b/certificates/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/certificates/locale/ru@petr1708/fusiondirectory.po b/certificates/locale/ru@petr1708/fusiondirectory.po
index b057fb07b37f090591e956827dcf287dbe7c805a..623dca613ef58c00d6b13ccd4a78e710d115c646 100644
--- a/certificates/locale/ru@petr1708/fusiondirectory.po
+++ b/certificates/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/certificates/locale/sv/fusiondirectory.po b/certificates/locale/sv/fusiondirectory.po
index 0f24305b7ff2ff399123f78447c79dea3ce0eb7a..58f3214fd60b8a4779e9e37284ebce2fa1332495 100644
--- a/certificates/locale/sv/fusiondirectory.po
+++ b/certificates/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/certificates/locale/tr_TR/fusiondirectory.po b/certificates/locale/tr_TR/fusiondirectory.po
index 4cc0574cdd93c23a6746e04ef8559e86e68c0407..2365cb13434a0c557166d8748c4f2a5d3838bfce 100644
--- a/certificates/locale/tr_TR/fusiondirectory.po
+++ b/certificates/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/certificates/locale/ug/fusiondirectory.po b/certificates/locale/ug/fusiondirectory.po
index 75408cd94c7783e0e0c3fd9a98e70a1bb2adaf53..aa8c11698aab8c03cfc78a92c7d26a10f9bb273d 100644
--- a/certificates/locale/ug/fusiondirectory.po
+++ b/certificates/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/certificates/locale/vi_VN/fusiondirectory.po b/certificates/locale/vi_VN/fusiondirectory.po
index 80a1502905a30b8cc71681cba868c28d2a01b69c..dfdc2334099b5506b2e267659f0227e6d1369678 100644
--- a/certificates/locale/vi_VN/fusiondirectory.po
+++ b/certificates/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/certificates/locale/zh/fusiondirectory.po b/certificates/locale/zh/fusiondirectory.po
index 01fb7e3321ea937b6d28c5ba601a864b9c65baba..0b0e0e02e0bf911693be1262c99544a4fded0e9f 100644
--- a/certificates/locale/zh/fusiondirectory.po
+++ b/certificates/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/certificates/locale/zh_TW/fusiondirectory.po b/certificates/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..82ad2a7eb1793aec848066747fc74c29ccb915af
--- /dev/null
+++ b/certificates/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,40 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: personal/certificates/class_userCertificates.inc:31
+#: personal/certificates/class_userCertificates.inc:32
+msgid "Download"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:75
+msgid "Unknown format"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:117
+#: personal/certificates/class_userCertificates.inc:132
+msgid "Certificates"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:118
+msgid "User certificates"
+msgstr ""
+
+#: personal/certificates/class_userCertificates.inc:136
+msgid "Certificate content"
+msgstr ""
diff --git a/community/locale/af_ZA/fusiondirectory.po b/community/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..bde0ab993b9ed5d1b80aba625a345cb9ce07c8c4
--- /dev/null
+++ b/community/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,154 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/departments/community/class_communityOrganization.inc:29
+msgid "Community organization"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:30
+msgid "Community organization dates and alternate address"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:42
+msgid "Membership"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:45
+msgid "Membership type"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:45
+msgid "Membership type of this organization"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:50
+msgid "Active"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:50
+msgid "Is the membership of this organization active"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:54
+msgid "Hidden"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:54
+msgid "Should this membership be hidden from listings"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:60
+msgid "Dates"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:63
+msgid "Start date"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:63
+msgid "Date of the beginning"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:67
+msgid "End date"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:67
+msgid "Date of the end"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:74
+msgid "Contact"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:77
+msgid "First name"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:81
+msgid "Last name"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:85
+msgid "Address"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:85
+msgid "A postal address"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:89
+msgid "City"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:93
+msgid "State"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:97
+msgid "Country"
+msgstr ""
+
+#: admin/departments/community/class_communityProject.inc:29
+msgid "Community project"
+msgstr ""
+
+#: admin/departments/community/class_communityProject.inc:30
+msgid "Community project dates and alternate address"
+msgstr ""
+
+#: admin/departments/community/class_communityProject.inc:42
+msgid "Project"
+msgstr ""
+
+#: admin/departments/community/class_communityProject.inc:45
+msgid "Project full name"
+msgstr ""
+
+#: admin/departments/community/class_communityProject.inc:45
+msgid "Full name of this project"
+msgstr ""
+
+#: admin/departments/community/class_communityProject.inc:49
+msgid "Project key"
+msgstr ""
+
+#: admin/departments/community/class_communityProject.inc:49
+msgid "ID used for this project in other softwares or databases"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr ""
diff --git a/community/locale/ar/fusiondirectory.po b/community/locale/ar/fusiondirectory.po
index 2910fd65265b6b43349ac7d75ed0c9d1e4c53dc8..b5ac5ab26252a987b16ea84563ff8dae4d987c2f 100644
--- a/community/locale/ar/fusiondirectory.po
+++ b/community/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/community/locale/ca/fusiondirectory.po b/community/locale/ca/fusiondirectory.po
index f734cde15ee56523a7146aa627b2638745ce3d52..d5fd524b56fedd88d851ac1bbdf528679eee03e7 100644
--- a/community/locale/ca/fusiondirectory.po
+++ b/community/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/community/locale/cs_CZ/fusiondirectory.po b/community/locale/cs_CZ/fusiondirectory.po
index e14e26c73c8a9bcd850f4871fc502fd4b675de96..ca4c0d68cc618f59543407fa4c5da36aed072bdc 100644
--- a/community/locale/cs_CZ/fusiondirectory.po
+++ b/community/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/departments/community/class_communityOrganization.inc:29
 msgid "Community organization"
diff --git a/community/locale/de/fusiondirectory.po b/community/locale/de/fusiondirectory.po
index f09d8ebd247096dd35a89e02035944b7ed302f39..78b86121b127fb9012127b523b22b869224891a3 100644
--- a/community/locale/de/fusiondirectory.po
+++ b/community/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/community/locale/el_GR/fusiondirectory.po b/community/locale/el_GR/fusiondirectory.po
index cdcfdb461f3ab00371abf78e1c5b00403c4c955f..d9ea26d4ca2a5cfae4c6e870c9d452a08bcaaebe 100644
--- a/community/locale/el_GR/fusiondirectory.po
+++ b/community/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/community/locale/es/fusiondirectory.po b/community/locale/es/fusiondirectory.po
index e1966962a597ad85442aee2b41671ea3a4d88736..a60c8f049f30c9cefb5175f457e5f7241224161f 100644
--- a/community/locale/es/fusiondirectory.po
+++ b/community/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/community/locale/es_CO/fusiondirectory.po b/community/locale/es_CO/fusiondirectory.po
index 307f1fc02a5ab70804b27b71cd46d899de6623b2..047d2b1e5d6b158298d9c382b3ab1234ea4f5de0 100644
--- a/community/locale/es_CO/fusiondirectory.po
+++ b/community/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/community/locale/es_VE/fusiondirectory.po b/community/locale/es_VE/fusiondirectory.po
index bb163175fd547436ed9a3f32970d7ef6b68de128..fd4e477c3758ce68055022f0814d692b7c99d405 100644
--- a/community/locale/es_VE/fusiondirectory.po
+++ b/community/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/community/locale/fa_IR/fusiondirectory.po b/community/locale/fa_IR/fusiondirectory.po
index a36cf541565eb4710c1ef1bbe97bb8a928c9aa31..35c31421559ec70e8941ca5fe4d2b757d20a1926 100644
--- a/community/locale/fa_IR/fusiondirectory.po
+++ b/community/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa_IR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/departments/community/class_communityOrganization.inc:29
 msgid "Community organization"
diff --git a/community/locale/fi_FI/fusiondirectory.po b/community/locale/fi_FI/fusiondirectory.po
index c3fa875f201109fdd48f064bcaea34411582b27b..5bc8363c760081810e62cb900c94087ab7dadfdc 100644
--- a/community/locale/fi_FI/fusiondirectory.po
+++ b/community/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/community/locale/fr/fusiondirectory.po b/community/locale/fr/fusiondirectory.po
index 87898c5338023dd4fde0bf53656363aa7b6c92ca..9183373ecc4cd9250570facfb31970e4f89cf01f 100644
--- a/community/locale/fr/fusiondirectory.po
+++ b/community/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/community/locale/hu_HU/fusiondirectory.po b/community/locale/hu_HU/fusiondirectory.po
index 9f65a28784d6192c20d95782468d234890bdab0e..96ba8f7029017aec94b6b5afacee4b6409b3d004 100644
--- a/community/locale/hu_HU/fusiondirectory.po
+++ b/community/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/community/locale/id/fusiondirectory.po b/community/locale/id/fusiondirectory.po
index b31437b5d4e03714a9db35c775baa4fd4ff53e86..89cdf67ca6f516791477689ef66e3544f0eac3f8 100644
--- a/community/locale/id/fusiondirectory.po
+++ b/community/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/community/locale/it_IT/fusiondirectory.po b/community/locale/it_IT/fusiondirectory.po
index 8de421bc89c062dec45b35b5fbc78ef38744dabb..8f407fbbea5d360c785bf3d6db5e81c315c6f446 100644
--- a/community/locale/it_IT/fusiondirectory.po
+++ b/community/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/community/locale/ja/fusiondirectory.po b/community/locale/ja/fusiondirectory.po
index 0cd6ad5ac726e6e112e87a4ed751adeb79382067..7799b6233916193313c8c243adc7b83ecc8baa92 100644
--- a/community/locale/ja/fusiondirectory.po
+++ b/community/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/community/locale/ko/fusiondirectory.po b/community/locale/ko/fusiondirectory.po
index 0b01edb750d360668040a2b2bc2f71da6b0d96b7..0b5c13a15dde26692f6dca168a355ff745a15e45 100644
--- a/community/locale/ko/fusiondirectory.po
+++ b/community/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/community/locale/lv/fusiondirectory.po b/community/locale/lv/fusiondirectory.po
index db50aa1ef83d5593498e1d36eeffe5c4cb368198..76d51d1e7eb027e3871e608832b323498cd2749f 100644
--- a/community/locale/lv/fusiondirectory.po
+++ b/community/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/community/locale/nb/fusiondirectory.po b/community/locale/nb/fusiondirectory.po
index 2abc55231f9968436b0b16d7773eb24fd6395627..a5dc983ed1b3260371f556074261a7c9b8ed4195 100644
--- a/community/locale/nb/fusiondirectory.po
+++ b/community/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/community/locale/nl/fusiondirectory.po b/community/locale/nl/fusiondirectory.po
index 49bfd5f85abb38996ce3d7df225e0e87c9e16d2a..1416bf101a96a7f874fedce29ad23915e2e5e4b4 100644
--- a/community/locale/nl/fusiondirectory.po
+++ b/community/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Lucien Antonissen <lucien.antonissen@digipolis.be>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/community/locale/pl/fusiondirectory.po b/community/locale/pl/fusiondirectory.po
index 721d84601b1d2bdb2ee2c8b759f8b2fc9327d354..865202e46927d1813f656acd67b4d37d3edf7755 100644
--- a/community/locale/pl/fusiondirectory.po
+++ b/community/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/community/locale/pt/fusiondirectory.po b/community/locale/pt/fusiondirectory.po
index 5dcbb137edafead97a2dbf59f24ec4930c1cd74b..4c96480afe0f52b27abe1059b275fa6b4cac7f82 100644
--- a/community/locale/pt/fusiondirectory.po
+++ b/community/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/community/locale/pt_BR/fusiondirectory.po b/community/locale/pt_BR/fusiondirectory.po
index f78181bf94a4e06eeb4fbb522a7d49810545c971..1cd6988144f67e42b73e07924cb1a492bbf03615 100644
--- a/community/locale/pt_BR/fusiondirectory.po
+++ b/community/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/community/locale/ru/fusiondirectory.po b/community/locale/ru/fusiondirectory.po
index f833ba311abed7357295a2fba5b69c94dfdb722f..40b74ffccda990c32035e70fe07a6b0fa4ce1edd 100644
--- a/community/locale/ru/fusiondirectory.po
+++ b/community/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/community/locale/ru@petr1708/fusiondirectory.po b/community/locale/ru@petr1708/fusiondirectory.po
index d157d6d415cb59c4c3c4b7914cdc907aaac7b849..5d56386aa843fa0d66e315fbbf822ddb7a692cb9 100644
--- a/community/locale/ru@petr1708/fusiondirectory.po
+++ b/community/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/community/locale/sv/fusiondirectory.po b/community/locale/sv/fusiondirectory.po
index 5acc83f83386a9bf309e544bca8eb07f7e527aae..573114aeb059ed7fa5942b44e6a4dada9ded153b 100644
--- a/community/locale/sv/fusiondirectory.po
+++ b/community/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/community/locale/tr_TR/fusiondirectory.po b/community/locale/tr_TR/fusiondirectory.po
index c5fb51bac3d0c415f797ef05a8458c8a29a01dde..032044b7566b345e1ecfe6e93400906748c28ff5 100644
--- a/community/locale/tr_TR/fusiondirectory.po
+++ b/community/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/community/locale/ug/fusiondirectory.po b/community/locale/ug/fusiondirectory.po
index dfa1d3a939c0dfacefaa5e44239be937556976fc..1e4e9fa57c47c3a850cded89cb3af2fd9206a8fe 100644
--- a/community/locale/ug/fusiondirectory.po
+++ b/community/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/community/locale/vi_VN/fusiondirectory.po b/community/locale/vi_VN/fusiondirectory.po
index d8daf47b1f47afb8bd095cfd60f76f75a2d08182..47f24cbdda39994abfdc3d5e0f09ee104706af6c 100644
--- a/community/locale/vi_VN/fusiondirectory.po
+++ b/community/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/community/locale/zh/fusiondirectory.po b/community/locale/zh/fusiondirectory.po
index d805a74660ca23bb647765c78e976bbe7245533b..5588411bd1e2ef84af76acca6ac72684c05b7a42 100644
--- a/community/locale/zh/fusiondirectory.po
+++ b/community/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/community/locale/zh_TW/fusiondirectory.po b/community/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..958f2ae6a109e8bc7f68b7b81d8138562d41ea1d
--- /dev/null
+++ b/community/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,154 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/departments/community/class_communityOrganization.inc:29
+msgid "Community organization"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:30
+msgid "Community organization dates and alternate address"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:42
+msgid "Membership"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:45
+msgid "Membership type"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:45
+msgid "Membership type of this organization"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:50
+msgid "Active"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:50
+msgid "Is the membership of this organization active"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:54
+msgid "Hidden"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:54
+msgid "Should this membership be hidden from listings"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:60
+msgid "Dates"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:63
+msgid "Start date"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:63
+msgid "Date of the beginning"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:67
+msgid "End date"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:67
+msgid "Date of the end"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:74
+msgid "Contact"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:77
+msgid "First name"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:81
+msgid "Last name"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:85
+msgid "Address"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:85
+msgid "A postal address"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:89
+msgid "City"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:93
+msgid "State"
+msgstr ""
+
+#: admin/departments/community/class_communityOrganization.inc:97
+msgid "Country"
+msgstr ""
+
+#: admin/departments/community/class_communityProject.inc:29
+msgid "Community project"
+msgstr ""
+
+#: admin/departments/community/class_communityProject.inc:30
+msgid "Community project dates and alternate address"
+msgstr ""
+
+#: admin/departments/community/class_communityProject.inc:42
+msgid "Project"
+msgstr ""
+
+#: admin/departments/community/class_communityProject.inc:45
+msgid "Project full name"
+msgstr ""
+
+#: admin/departments/community/class_communityProject.inc:45
+msgid "Full name of this project"
+msgstr ""
+
+#: admin/departments/community/class_communityProject.inc:49
+msgid "Project key"
+msgstr ""
+
+#: admin/departments/community/class_communityProject.inc:49
+msgid "ID used for this project in other softwares or databases"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:28
+msgid "Community configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:29
+msgid "FusionDirectory community plugin configuration"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:41
+msgid "Community"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Membership type choices"
+msgstr ""
+
+#: config/community/class_communityConfig.inc:45
+msgid "Community membership types available in the user community tab"
+msgstr ""
diff --git a/cyrus/locale/af_ZA/fusiondirectory.po b/cyrus/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..7e6fb3a7a041cd98c78bb8b98775b562655d1ef0
--- /dev/null
+++ b/cyrus/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,154 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:30
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:31
+msgid "Cyrus (IMAP/POP3)"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:31
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:45
+msgid "Cyrus settings"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:48
+msgid "Connect URL for Cyrus server"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:52
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:93
+msgid "Hostname"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:52
+msgid "Hostname of the Cyrus server"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:56
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:97
+msgid "Port"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:56
+msgid "Port number on which Cyrus server should be contacted"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:61
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:102
+msgid "Option"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:61
+msgid "Options for contacting Cyrus server"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:66
+msgid "Valide certificats"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:66
+msgid "Weither or not to validate server certificate on connexion"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:76
+msgid "Admin user"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:76
+msgid "Imap server admin user"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:80
+msgid "Password"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:80
+msgid "Admin user password"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:86
+msgid "Sieve settings"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:89
+msgid "Sieve connect URL for Cyrus server"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:93
+msgid "Hostname of the Cyrus sieve server"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:97
+msgid "Port number on which Cyrus sieve server should be contacted"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:102
+msgid "Options for contacting Cyrus sieve server"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: 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:241
+msgid "IMAP error"
+msgstr ""
+
+#: 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:315
+msgid "Mail info"
+msgstr ""
+
+#: 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: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:510
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr ""
diff --git a/cyrus/locale/ar/fusiondirectory.po b/cyrus/locale/ar/fusiondirectory.po
index 2e3113b65ff7f89b4a8500f3e84f000fe21f9fc8..f0e25d2eb4a924fc7ae49627427164332ba229f2 100644
--- a/cyrus/locale/ar/fusiondirectory.po
+++ b/cyrus/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/cyrus/locale/ca/fusiondirectory.po b/cyrus/locale/ca/fusiondirectory.po
index 07f4429adf358501333f3b1d43bad10dfb0ff06f..a549c0eeaade720f1b872e9f56411d91d873c782 100644
--- a/cyrus/locale/ca/fusiondirectory.po
+++ b/cyrus/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/cyrus/locale/cs_CZ/fusiondirectory.po b/cyrus/locale/cs_CZ/fusiondirectory.po
index 70dcc07ba7aa9a3f3780cb54c4ad30e45eda9d31..54b5f370647455d913251ace94d141785b493a83 100644
--- a/cyrus/locale/cs_CZ/fusiondirectory.po
+++ b/cyrus/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
diff --git a/cyrus/locale/de/fusiondirectory.po b/cyrus/locale/de/fusiondirectory.po
index cf3480723a6a9f643ea9cceef3c6dd1964ae0c98..1b0de149c2510b643e2b145b9489a4df07a8464e 100644
--- a/cyrus/locale/de/fusiondirectory.po
+++ b/cyrus/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/cyrus/locale/el_GR/fusiondirectory.po b/cyrus/locale/el_GR/fusiondirectory.po
index ddc6f04774da98290da88a18b19cd8e6861b63d5..5f1681f518ad8b53e536934df2dbf00dda9625c2 100644
--- a/cyrus/locale/el_GR/fusiondirectory.po
+++ b/cyrus/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/cyrus/locale/es/fusiondirectory.po b/cyrus/locale/es/fusiondirectory.po
index 05cffe47a1b5a0bb797a3f7312008ccec4db29ef..0d9b02eb6fb8495b4b1fc454eeb12b137966357e 100644
--- a/cyrus/locale/es/fusiondirectory.po
+++ b/cyrus/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/cyrus/locale/es_CO/fusiondirectory.po b/cyrus/locale/es_CO/fusiondirectory.po
index e754e834f686bb7211ec0f8739434f6100a65e4a..614d24a5dd4077579d5cb798f50fb88cc28ead70 100644
--- a/cyrus/locale/es_CO/fusiondirectory.po
+++ b/cyrus/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/cyrus/locale/es_VE/fusiondirectory.po b/cyrus/locale/es_VE/fusiondirectory.po
index 904c6bb5c2e23f6e9a076253fafde67259bfdc38..88f39ba6689aae51f94b56b40b92ce460d4ae557 100644
--- a/cyrus/locale/es_VE/fusiondirectory.po
+++ b/cyrus/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/cyrus/locale/fa_IR/fusiondirectory.po b/cyrus/locale/fa_IR/fusiondirectory.po
index d945dc78af71d1000de7589f1525e848e539a104..0686bafd1d5810788499dae3cbe80dbf6e51a95d 100644
--- a/cyrus/locale/fa_IR/fusiondirectory.po
+++ b/cyrus/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
diff --git a/cyrus/locale/fi_FI/fusiondirectory.po b/cyrus/locale/fi_FI/fusiondirectory.po
index 3f3a8128379b98f996c04b00f51d644fef98db66..cfe79a99d18f42443b9aef573f6136390b2b1636 100644
--- a/cyrus/locale/fi_FI/fusiondirectory.po
+++ b/cyrus/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/cyrus/locale/fr/fusiondirectory.po b/cyrus/locale/fr/fusiondirectory.po
index b4145f74bccd1d26b9f697369fbb18ddc9fa0478..90e665e151d045757234456011a1b593fc7cb830 100644
--- a/cyrus/locale/fr/fusiondirectory.po
+++ b/cyrus/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/cyrus/locale/hu_HU/fusiondirectory.po b/cyrus/locale/hu_HU/fusiondirectory.po
index 288d283885d902e6d70b3dad624ccf05d8f78a23..eb538639210a5a62dc2a34729133bdc5039892a5 100644
--- a/cyrus/locale/hu_HU/fusiondirectory.po
+++ b/cyrus/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/cyrus/locale/id/fusiondirectory.po b/cyrus/locale/id/fusiondirectory.po
index a3ae5b9ca826b4a7824b76075856a02a146c19d3..f1484f2fc115da5714e53a83701fc05db0c4c912 100644
--- a/cyrus/locale/id/fusiondirectory.po
+++ b/cyrus/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/cyrus/locale/it_IT/fusiondirectory.po b/cyrus/locale/it_IT/fusiondirectory.po
index 5cb6440719f851cef73e52b126566f65de02e710..22ee251b3a632d7393b146d4036b6fe8130b30e7 100644
--- a/cyrus/locale/it_IT/fusiondirectory.po
+++ b/cyrus/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/cyrus/locale/ja/fusiondirectory.po b/cyrus/locale/ja/fusiondirectory.po
index 430293c17e8031226708cdc1d4361f49ff2a723f..69a6d7e2a94b32145b1af3635a6d59815e1284ac 100644
--- a/cyrus/locale/ja/fusiondirectory.po
+++ b/cyrus/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/cyrus/locale/ko/fusiondirectory.po b/cyrus/locale/ko/fusiondirectory.po
index 1a6ce4abe3eb0af135e6c7b32679d2254693949c..2ab6c9ec10b3de90e4d1ffed79a9726ddf91b3d5 100644
--- a/cyrus/locale/ko/fusiondirectory.po
+++ b/cyrus/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/cyrus/locale/lv/fusiondirectory.po b/cyrus/locale/lv/fusiondirectory.po
index 0601a3bb784202515836c2c672edd2385d56818c..f538a50d500949839bfa2d5eac03739f723cad63 100644
--- a/cyrus/locale/lv/fusiondirectory.po
+++ b/cyrus/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/cyrus/locale/nb/fusiondirectory.po b/cyrus/locale/nb/fusiondirectory.po
index 30659bfa11054c27c7b5c18775cfd13313e60c91..29a9f8eb5859312a0f444f4d2e646a0c798e52bf 100644
--- a/cyrus/locale/nb/fusiondirectory.po
+++ b/cyrus/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/cyrus/locale/nl/fusiondirectory.po b/cyrus/locale/nl/fusiondirectory.po
index 16ee16db56774e69030d9f22a1c88b93fe530245..cd6c76dc31964e1d57e49fa1020b52ccd7c5dcfe 100644
--- a/cyrus/locale/nl/fusiondirectory.po
+++ b/cyrus/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/cyrus/locale/pl/fusiondirectory.po b/cyrus/locale/pl/fusiondirectory.po
index ead473df34a4365803871a43eea39672c01ec172..7becb49b8de93ebaaf4792641976256c9aafe6ea 100644
--- a/cyrus/locale/pl/fusiondirectory.po
+++ b/cyrus/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/cyrus/locale/pt/fusiondirectory.po b/cyrus/locale/pt/fusiondirectory.po
index 8c6d908e432cdd3c480661ace0f9776312bb4d53..26230c0f705500498b496939e1ba6b8c7c30fe1f 100644
--- a/cyrus/locale/pt/fusiondirectory.po
+++ b/cyrus/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/cyrus/locale/pt_BR/fusiondirectory.po b/cyrus/locale/pt_BR/fusiondirectory.po
index dace4fd09eacd437a38f24f1abb69376b9095ae4..ee8972b6b3ad2d1e03f69330a02551b11fcf9860 100644
--- a/cyrus/locale/pt_BR/fusiondirectory.po
+++ b/cyrus/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/cyrus/locale/ru/fusiondirectory.po b/cyrus/locale/ru/fusiondirectory.po
index 4dc2c16b0376a0ea2cd6f3e4efd31ec5fb2fbbe1..9b09251bbdbc02df1e2f89f09870ece9c158c68a 100644
--- a/cyrus/locale/ru/fusiondirectory.po
+++ b/cyrus/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/cyrus/locale/ru@petr1708/fusiondirectory.po b/cyrus/locale/ru@petr1708/fusiondirectory.po
index 3e6c89bafbe835897f2aa6e4bfb04260158bb92b..8cc9e79b1cb784dec7b7f157e0115291d83b8579 100644
--- a/cyrus/locale/ru@petr1708/fusiondirectory.po
+++ b/cyrus/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/cyrus/locale/sv/fusiondirectory.po b/cyrus/locale/sv/fusiondirectory.po
index 75a5dd8a2a8bd3b9cdcbc5d8a9a6d4afb6ac6ae2..cbbc7a768b684fcbbbe0d683aa28c776cc2e45b3 100644
--- a/cyrus/locale/sv/fusiondirectory.po
+++ b/cyrus/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/cyrus/locale/tr_TR/fusiondirectory.po b/cyrus/locale/tr_TR/fusiondirectory.po
index 44384951c57173f8b311e7b1f481c3055d29e474..76101c5288d50384be84dff5b45a6506c6592824 100644
--- a/cyrus/locale/tr_TR/fusiondirectory.po
+++ b/cyrus/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/cyrus/locale/ug/fusiondirectory.po b/cyrus/locale/ug/fusiondirectory.po
index d9a2d03674471fe4ecfa213516307fccb6547970..f2450e0ed2e5e6894d575fce89982674a6157198 100644
--- a/cyrus/locale/ug/fusiondirectory.po
+++ b/cyrus/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/cyrus/locale/vi_VN/fusiondirectory.po b/cyrus/locale/vi_VN/fusiondirectory.po
index ceaa9bed0369e7ed2fca3089a1503d6b43854fdd..e7301d525c8841f942a7b21986db35d4462bb8d1 100644
--- a/cyrus/locale/vi_VN/fusiondirectory.po
+++ b/cyrus/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/cyrus/locale/zh/fusiondirectory.po b/cyrus/locale/zh/fusiondirectory.po
index cc5c4a4030bec0ac41b30ccd126f547c6900722e..630f908b32a61a07fb13b5ee8dd795c8100268e5 100644
--- a/cyrus/locale/zh/fusiondirectory.po
+++ b/cyrus/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/cyrus/locale/zh_TW/fusiondirectory.po b/cyrus/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..d824b47d6d3b0093e96e919610b933853fb6e8a0
--- /dev/null
+++ b/cyrus/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,154 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:30
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:31
+msgid "Cyrus (IMAP/POP3)"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:31
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:45
+msgid "Cyrus settings"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:48
+msgid "Connect URL for Cyrus server"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:52
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:93
+msgid "Hostname"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:52
+msgid "Hostname of the Cyrus server"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:56
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:97
+msgid "Port"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:56
+msgid "Port number on which Cyrus server should be contacted"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:61
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:102
+msgid "Option"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:61
+msgid "Options for contacting Cyrus server"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:66
+msgid "Valide certificats"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:66
+msgid "Weither or not to validate server certificate on connexion"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:76
+msgid "Admin user"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:76
+msgid "Imap server admin user"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:80
+msgid "Password"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:80
+msgid "Admin user password"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:86
+msgid "Sieve settings"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:89
+msgid "Sieve connect URL for Cyrus server"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:93
+msgid "Hostname of the Cyrus sieve server"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:97
+msgid "Port number on which Cyrus sieve server should be contacted"
+msgstr ""
+
+#: admin/systems/services/cyrus/class_serviceCyrus.inc:102
+msgid "Options for contacting Cyrus sieve server"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: 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:241
+msgid "IMAP error"
+msgstr ""
+
+#: 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:315
+msgid "Mail info"
+msgstr ""
+
+#: 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: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:510
+#, php-format
+msgid "Cannot retrieve SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:578
+#, php-format
+msgid "Cannot store SIEVE script: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:585
+#, php-format
+msgid "Cannot activate SIEVE script: %s"
+msgstr ""
diff --git a/debconf/locale/af_ZA/fusiondirectory.po b/debconf/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..935dc0d2e12118e75172a7895d6ac1dec265ce1f
--- /dev/null
+++ b/debconf/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,121 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
+msgid "Error"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+msgid "There is no template for this profile"
+msgstr ""
+
+#: 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:139
+msgid "LDAP error"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
+msgid "LDIF error"
+msgstr ""
+
+#: 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 ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
+msgid "Debconf profile"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+msgid "Debconf profile information"
+msgstr ""
+
+#: 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:189
+msgid "Import a debconf file"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
+msgid "Name of this debconf template"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+msgid "Entries"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
+msgid "Debconf template answers"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
+msgid "Import"
+msgstr ""
+
+#: admin/systems/debconf/class_debconfStartup.inc:34
+msgid "Debconf preseed startup"
+msgstr ""
+
+#: admin/systems/debconf/class_debconfStartup.inc:46
+msgid "Debconf settings"
+msgstr ""
+
+#: admin/systems/debconf/class_debconfStartup.inc:49
+msgid "Profile"
+msgstr ""
+
+#: admin/systems/debconf/class_debconfStartup.inc:49
+msgid "Debconf preseed profile to be used for installation"
+msgstr ""
+
+#: admin/systems/debconf/class_debconfStartup.inc:53
+msgid "Release"
+msgstr ""
+
+#: admin/systems/debconf/class_debconfStartup.inc:53
+msgid "Debian release to install"
+msgstr ""
+
+#: admin/debconfProfile/debconfProfile-filter.tpl.c:2
+msgid "Filter"
+msgstr ""
diff --git a/debconf/locale/ar/fusiondirectory.po b/debconf/locale/ar/fusiondirectory.po
index 4363f6364058f88d470958cd14c7934de4740a51..aed2cb29905bef85d215ea95817b610c91546ae1 100644
--- a/debconf/locale/ar/fusiondirectory.po
+++ b/debconf/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/debconf/locale/ca/fusiondirectory.po b/debconf/locale/ca/fusiondirectory.po
index 45a191b28dca5a04d7821391cb064de576c83768..1919ea90ddb237c8c4e1d4f58738636d4057e50a 100644
--- a/debconf/locale/ca/fusiondirectory.po
+++ b/debconf/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/debconf/locale/cs_CZ/fusiondirectory.po b/debconf/locale/cs_CZ/fusiondirectory.po
index 5fc332fe50c4cb76cd1a02553eb52c91702db06d..2662ce452ac9f81cf409e135e6224125cdb6e814 100644
--- a/debconf/locale/cs_CZ/fusiondirectory.po
+++ b/debconf/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/debconfProfile/class_debconfProfileManagement.inc:32
 #: admin/systems/debconf/class_debconfStartup.inc:33
diff --git a/debconf/locale/de/fusiondirectory.po b/debconf/locale/de/fusiondirectory.po
index f9b41685107e691c569bad78ca2f248fa2495c0c..84cba8ba54ea616a66e82f156e19ea72dd58bbf3 100644
--- a/debconf/locale/de/fusiondirectory.po
+++ b/debconf/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/debconf/locale/el_GR/fusiondirectory.po b/debconf/locale/el_GR/fusiondirectory.po
index 51de0b402a15e316a2cfaec29a442b557dd1c6aa..b444af4b3de4a3d4b9ec2c8875202a71a70829e9 100644
--- a/debconf/locale/el_GR/fusiondirectory.po
+++ b/debconf/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/debconf/locale/es/fusiondirectory.po b/debconf/locale/es/fusiondirectory.po
index 1f47866abbf4eedd917e77bacd3ca64a9042aa9b..ee22fca4b8d9e10416811cbde0f8c115d82302c2 100644
--- a/debconf/locale/es/fusiondirectory.po
+++ b/debconf/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/debconf/locale/es_CO/fusiondirectory.po b/debconf/locale/es_CO/fusiondirectory.po
index 3b6bdf67f518f7efb76e5e869611efe3685051ec..06466283eb448ac03249967f2f897df327d781c9 100644
--- a/debconf/locale/es_CO/fusiondirectory.po
+++ b/debconf/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/debconf/locale/es_VE/fusiondirectory.po b/debconf/locale/es_VE/fusiondirectory.po
index 9a7f876234b9a964b9a002a7eef17f356c124408..9919746dde81f71b810c8711cd00ffbd05a1da41 100644
--- a/debconf/locale/es_VE/fusiondirectory.po
+++ b/debconf/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/debconf/locale/fa_IR/fusiondirectory.po b/debconf/locale/fa_IR/fusiondirectory.po
index 5b4460398fa68ab5b812bc48e03630e9149ee21c..6e5dfca26efb4f593e0c23b1675dbd30d4107357 100644
--- a/debconf/locale/fa_IR/fusiondirectory.po
+++ b/debconf/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa_IR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/debconfProfile/class_debconfProfileManagement.inc:32
 #: admin/systems/debconf/class_debconfStartup.inc:33
diff --git a/debconf/locale/fi_FI/fusiondirectory.po b/debconf/locale/fi_FI/fusiondirectory.po
index 7717c4616500142f75141912d6dc697da04f766d..0d002fedd363cecfea175a71bd6910af22a67218 100644
--- a/debconf/locale/fi_FI/fusiondirectory.po
+++ b/debconf/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/debconf/locale/fr/fusiondirectory.po b/debconf/locale/fr/fusiondirectory.po
index 512929a36d4af570fb5681df148369c3644e6580..4896f63f7a6ca0558e7c9322f63962366929badf 100644
--- a/debconf/locale/fr/fusiondirectory.po
+++ b/debconf/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/debconf/locale/hu_HU/fusiondirectory.po b/debconf/locale/hu_HU/fusiondirectory.po
index c6ce1132235e3c7c7c132c41e3759abfa60eef93..c3dba455e58eb564ad284be023aeb1fc43c75d3e 100644
--- a/debconf/locale/hu_HU/fusiondirectory.po
+++ b/debconf/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/debconf/locale/id/fusiondirectory.po b/debconf/locale/id/fusiondirectory.po
index 5d7dae1ad615ca9cbc78c369cd852113f752c22f..76d169811f7e77c4b48f2c130d2605d872babf32 100644
--- a/debconf/locale/id/fusiondirectory.po
+++ b/debconf/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/debconf/locale/it_IT/fusiondirectory.po b/debconf/locale/it_IT/fusiondirectory.po
index dc6e2c10de98e537aa1d4befa145085f6b8aa7c1..010978f59d4e5933e79fbce7bdd392256bc3e2bf 100644
--- a/debconf/locale/it_IT/fusiondirectory.po
+++ b/debconf/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/debconf/locale/ja/fusiondirectory.po b/debconf/locale/ja/fusiondirectory.po
index e105b7ff2ca0870bf7745a38f77da45e00c1447f..0bf9d773a6e9a5f3275700a333de65e9ab2b721a 100644
--- a/debconf/locale/ja/fusiondirectory.po
+++ b/debconf/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/debconf/locale/ko/fusiondirectory.po b/debconf/locale/ko/fusiondirectory.po
index 4fbcc6b2eea5a3376d643c0b8e2179a501fcc740..cc80d0d6bbf73eccd85e72f683402efe1452c806 100644
--- a/debconf/locale/ko/fusiondirectory.po
+++ b/debconf/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/debconf/locale/lv/fusiondirectory.po b/debconf/locale/lv/fusiondirectory.po
index b45c5c5fad413f5a64cca32c2216a61e76226578..d77d71f0e5371018bde46e32423a9878995801eb 100644
--- a/debconf/locale/lv/fusiondirectory.po
+++ b/debconf/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/debconf/locale/nb/fusiondirectory.po b/debconf/locale/nb/fusiondirectory.po
index e9d4b00dd002213292abd7981b82649e991c1961..1e7d2987e305b169083206d5546f1dbdf46b1e65 100644
--- a/debconf/locale/nb/fusiondirectory.po
+++ b/debconf/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/debconf/locale/nl/fusiondirectory.po b/debconf/locale/nl/fusiondirectory.po
index 734a2d6015e07a3c0931f1fb8a8c0fa46cd7b501..fe63d2c71f127e7125cd00cc499cdf68452f4907 100644
--- a/debconf/locale/nl/fusiondirectory.po
+++ b/debconf/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/debconf/locale/pl/fusiondirectory.po b/debconf/locale/pl/fusiondirectory.po
index f0e1b8937247d145de51fdf9a563a2681714a5f9..67bee2c8c16606ae03b79781fc212904bbe86b7a 100644
--- a/debconf/locale/pl/fusiondirectory.po
+++ b/debconf/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/debconf/locale/pt/fusiondirectory.po b/debconf/locale/pt/fusiondirectory.po
index 937394f99ef7bb61897f9d18ef19b8c2fbfc875c..1ae89629f9bcf44fa12c05740461a923a548640e 100644
--- a/debconf/locale/pt/fusiondirectory.po
+++ b/debconf/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/debconf/locale/pt_BR/fusiondirectory.po b/debconf/locale/pt_BR/fusiondirectory.po
index 8550403e01b0c045ebc81b4c06ecbbe0d56e69df..5496cc88ea0ebdc8d10027f185d11db07086100a 100644
--- a/debconf/locale/pt_BR/fusiondirectory.po
+++ b/debconf/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/debconf/locale/ru/fusiondirectory.po b/debconf/locale/ru/fusiondirectory.po
index 4231064e2d93f0ab3be4e6db8ebe99f571ca26ac..b44850624bedc217b8acb16dbb64507e7ff8df3e 100644
--- a/debconf/locale/ru/fusiondirectory.po
+++ b/debconf/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/debconf/locale/ru@petr1708/fusiondirectory.po b/debconf/locale/ru@petr1708/fusiondirectory.po
index 10dc16dc6c38348e62179c951edd0484b0d04149..d4198e44e24d32fe6e18c8412a9c04c755141a5f 100644
--- a/debconf/locale/ru@petr1708/fusiondirectory.po
+++ b/debconf/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/debconf/locale/sv/fusiondirectory.po b/debconf/locale/sv/fusiondirectory.po
index 2f0729374ec0939772edfb549d323cdd8e131d59..f05c2cd1017dc4c8fe2ca31f19484e5c15d5b7fb 100644
--- a/debconf/locale/sv/fusiondirectory.po
+++ b/debconf/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/debconf/locale/tr_TR/fusiondirectory.po b/debconf/locale/tr_TR/fusiondirectory.po
index 32dc170688773fa512f303fd2cffb40c78a76c4e..08ae0754636fe1700c18d6383849293b19531572 100644
--- a/debconf/locale/tr_TR/fusiondirectory.po
+++ b/debconf/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/debconf/locale/ug/fusiondirectory.po b/debconf/locale/ug/fusiondirectory.po
index 6844d659c45865e532620d1ff4b8240436a62275..f7a7f51224b0e9dc066f9e266676e2841f0292e8 100644
--- a/debconf/locale/ug/fusiondirectory.po
+++ b/debconf/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/debconf/locale/vi_VN/fusiondirectory.po b/debconf/locale/vi_VN/fusiondirectory.po
index 411c0a5af668b172befaa6d391e39366f847fd57..0c73f124c256d77e515383bb8cf67c9adbc80b41 100644
--- a/debconf/locale/vi_VN/fusiondirectory.po
+++ b/debconf/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/debconf/locale/zh/fusiondirectory.po b/debconf/locale/zh/fusiondirectory.po
index d5f0e1764973c32f1da44c651d7d88a96c787b23..f991c049344ed215cd0066b1f5455d3e26e9809b 100644
--- a/debconf/locale/zh/fusiondirectory.po
+++ b/debconf/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/debconf/locale/zh_TW/fusiondirectory.po b/debconf/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..fcfd02b5f07869c227c6a23d69949c5eb2d0962c
--- /dev/null
+++ b/debconf/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,121 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:32
+#: admin/systems/debconf/class_debconfStartup.inc:33
+msgid "Debconf"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileManagement.inc:33
+msgid "Debconf profile management"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
+msgid "Error"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+msgid "There is no template for this profile"
+msgstr ""
+
+#: 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:139
+msgid "LDAP error"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
+msgid "LDIF error"
+msgstr ""
+
+#: 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 ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
+msgid "Debconf profile"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+msgid "Debconf profile information"
+msgstr ""
+
+#: 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:189
+msgid "Import a debconf file"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
+msgid "Name of this debconf template"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
+msgid "Entries"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
+msgid "Debconf template answers"
+msgstr ""
+
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
+msgid "Import"
+msgstr ""
+
+#: admin/systems/debconf/class_debconfStartup.inc:34
+msgid "Debconf preseed startup"
+msgstr ""
+
+#: admin/systems/debconf/class_debconfStartup.inc:46
+msgid "Debconf settings"
+msgstr ""
+
+#: admin/systems/debconf/class_debconfStartup.inc:49
+msgid "Profile"
+msgstr ""
+
+#: admin/systems/debconf/class_debconfStartup.inc:49
+msgid "Debconf preseed profile to be used for installation"
+msgstr ""
+
+#: admin/systems/debconf/class_debconfStartup.inc:53
+msgid "Release"
+msgstr ""
+
+#: admin/systems/debconf/class_debconfStartup.inc:53
+msgid "Debian release to install"
+msgstr ""
+
+#: admin/debconfProfile/debconfProfile-filter.tpl.c:2
+msgid "Filter"
+msgstr ""
diff --git a/developers/locale/af_ZA/fusiondirectory.po b/developers/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..7ed0b81476f9b0e2f00a92bc7a6e2cd85debf24c
--- /dev/null
+++ b/developers/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,47 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
+msgid "Object Types"
+msgstr ""
+
+#: debug-help/addons/debug-help/debughelp.tpl.c:2
+msgid "Insufficient rights"
+msgstr ""
diff --git a/developers/locale/ar/fusiondirectory.po b/developers/locale/ar/fusiondirectory.po
index 4211fd432e93938b14ed5a196717a3dd86690179..226fc87156e641b3aafa52666328a7d62b73b370 100644
--- a/developers/locale/ar/fusiondirectory.po
+++ b/developers/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/developers/locale/ca/fusiondirectory.po b/developers/locale/ca/fusiondirectory.po
index 7fa6ef4f0ecb521354009b110cbab4deec847a24..f15168891b23d7682c368f5548549c7e8601466b 100644
--- a/developers/locale/ca/fusiondirectory.po
+++ b/developers/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/developers/locale/cs_CZ/fusiondirectory.po b/developers/locale/cs_CZ/fusiondirectory.po
index 1908b6819d9590141e11b56692d5aeca6d0a7883..0fff94963323f7a35696863ec3885100113e52e1 100644
--- a/developers/locale/cs_CZ/fusiondirectory.po
+++ b/developers/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: debug-help/addons/debug-help/class_debugHelp.inc:26
 #: debug-help/addons/debug-help/class_debugHelp.inc:32
diff --git a/developers/locale/de/fusiondirectory.po b/developers/locale/de/fusiondirectory.po
index 4e37bb6ee41a88dc730a9bb785f37dfd51cf2839..f0f12c1284b142f829f9a9c3a1ea63654a7498dc 100644
--- a/developers/locale/de/fusiondirectory.po
+++ b/developers/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/developers/locale/el_GR/fusiondirectory.po b/developers/locale/el_GR/fusiondirectory.po
index 9e4a986699acb53c859ddd4e2070ff5a0bc9c1a2..56826f28fdee7a4c60d0be87741a38dbf9a01729 100644
--- a/developers/locale/el_GR/fusiondirectory.po
+++ b/developers/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/developers/locale/es/fusiondirectory.po b/developers/locale/es/fusiondirectory.po
index ccd1182ab46f4f675d8673b9a2e0c362c1bc3a4a..dab30e6a0a0e4e20a26cd3ef6fad28f8bcf9bdb4 100644
--- a/developers/locale/es/fusiondirectory.po
+++ b/developers/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
diff --git a/developers/locale/es_CO/fusiondirectory.po b/developers/locale/es_CO/fusiondirectory.po
index 125774829c754276dfd934acc04638a024bac6c9..defa6f3c16cc9d6dd0fe6205c528863b8a31470e 100644
--- a/developers/locale/es_CO/fusiondirectory.po
+++ b/developers/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/developers/locale/es_VE/fusiondirectory.po b/developers/locale/es_VE/fusiondirectory.po
index c6c72b043eeea4755e3189bb2d45591ddad3f6b6..74b684eb23e5eb36296c1fdfbad01646ecc90a4d 100644
--- a/developers/locale/es_VE/fusiondirectory.po
+++ b/developers/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/developers/locale/fa_IR/fusiondirectory.po b/developers/locale/fa_IR/fusiondirectory.po
index 1a90c2ce9983311618c049538fd58e940cca9984..ba994c49ebe877ef6483eb683e35402e5dc21e5d 100644
--- a/developers/locale/fa_IR/fusiondirectory.po
+++ b/developers/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: debug-help/addons/debug-help/class_debugHelp.inc:26
 #: debug-help/addons/debug-help/class_debugHelp.inc:32
diff --git a/developers/locale/fi_FI/fusiondirectory.po b/developers/locale/fi_FI/fusiondirectory.po
index f5f7bba3b0b6b0f0617fe59f68040b67f1bd172b..cb207eb987e4d5a7f0c0ca915bbb043000f3881b 100644
--- a/developers/locale/fi_FI/fusiondirectory.po
+++ b/developers/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/developers/locale/fr/fusiondirectory.po b/developers/locale/fr/fusiondirectory.po
index c3b51ee9629c8a917c944809413b053879384141..03900844d9f3ededd7d49f1d2d9bc0e4e1cb6a0a 100644
--- a/developers/locale/fr/fusiondirectory.po
+++ b/developers/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/developers/locale/hu_HU/fusiondirectory.po b/developers/locale/hu_HU/fusiondirectory.po
index de3ae0ef7c851bb2f90ca6bb2a62faf5e2f8e396..388093937cca42a00c7e74871a3badebe040e3ea 100644
--- a/developers/locale/hu_HU/fusiondirectory.po
+++ b/developers/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/developers/locale/id/fusiondirectory.po b/developers/locale/id/fusiondirectory.po
index 29e128a59d8d5dd3653142cb6170047a5512c001..a4ed46d3be4fb465546276a0751a84ba752f74c2 100644
--- a/developers/locale/id/fusiondirectory.po
+++ b/developers/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/developers/locale/it_IT/fusiondirectory.po b/developers/locale/it_IT/fusiondirectory.po
index 08d423425ffeadebeb3566fdde3fc65a0694d7f6..cafb3e2f513312b991b033b6fd16fe549e419b24 100644
--- a/developers/locale/it_IT/fusiondirectory.po
+++ b/developers/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/developers/locale/ja/fusiondirectory.po b/developers/locale/ja/fusiondirectory.po
index ff481027dc06cc22981c70521b92c5d747ab17f1..8cac5e55099b5aef4bb28d0d7c05442c2aeb0c64 100644
--- a/developers/locale/ja/fusiondirectory.po
+++ b/developers/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/developers/locale/ko/fusiondirectory.po b/developers/locale/ko/fusiondirectory.po
index aae1b8a0246e42d7733e8d5f4c4b56c32df4a986..e0eaa37682373e213348f118d8680ff17e00f040 100644
--- a/developers/locale/ko/fusiondirectory.po
+++ b/developers/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/developers/locale/lv/fusiondirectory.po b/developers/locale/lv/fusiondirectory.po
index a561500d27b33827a39eb5a83e0c9e908f006c41..e573fcbaf8892c768bfc3c2c649c6160a671a7bb 100644
--- a/developers/locale/lv/fusiondirectory.po
+++ b/developers/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/developers/locale/nb/fusiondirectory.po b/developers/locale/nb/fusiondirectory.po
index e207f7e501a30bc6d64d2aed0bad7c5495a440a9..57ebecba5c16dbeeb5249375ddec24fdcf392bde 100644
--- a/developers/locale/nb/fusiondirectory.po
+++ b/developers/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/developers/locale/nl/fusiondirectory.po b/developers/locale/nl/fusiondirectory.po
index 4e7a2cecd28ea2eda14557cbfa60801e5f4ab28a..1b11139fd1bf15d66e11cb883e090bdda31eead8 100644
--- a/developers/locale/nl/fusiondirectory.po
+++ b/developers/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/developers/locale/pl/fusiondirectory.po b/developers/locale/pl/fusiondirectory.po
index 20e33483b076a886cd021885d07a7fa3c174091c..8e71337282b4f6aba8764f3090064a655c03e548 100644
--- a/developers/locale/pl/fusiondirectory.po
+++ b/developers/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/developers/locale/pt/fusiondirectory.po b/developers/locale/pt/fusiondirectory.po
index 8ea947676c2fe18e778a98879bdffcd6e64b75dc..2ecf087e3f24e6f21f545923cd057fcd2e1f4fc4 100644
--- a/developers/locale/pt/fusiondirectory.po
+++ b/developers/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
diff --git a/developers/locale/pt_BR/fusiondirectory.po b/developers/locale/pt_BR/fusiondirectory.po
index 622920302c9df9eef28d39d8f0865b3cb6d8da7f..54491c9384770caa559e2a311ef75cf3e595e3e4 100644
--- a/developers/locale/pt_BR/fusiondirectory.po
+++ b/developers/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/developers/locale/ru/fusiondirectory.po b/developers/locale/ru/fusiondirectory.po
index ca348116bf92aa952d78eb74b68f2ad8f0be0372..f573d6b1166ae00ba4c6b2590c78b39271db7038 100644
--- a/developers/locale/ru/fusiondirectory.po
+++ b/developers/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/developers/locale/ru@petr1708/fusiondirectory.po b/developers/locale/ru@petr1708/fusiondirectory.po
index 717999eb6e0a9f0e6c967db9e1f65494d7bcbdd7..b6588c639330e25f4120022ab79920dface2c9fe 100644
--- a/developers/locale/ru@petr1708/fusiondirectory.po
+++ b/developers/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/developers/locale/sv/fusiondirectory.po b/developers/locale/sv/fusiondirectory.po
index 2e847301c6d3feaa5e533dea0bae1e1d423776e1..cf9c526ee7a61f5c157dc104243850ec9411ee91 100644
--- a/developers/locale/sv/fusiondirectory.po
+++ b/developers/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/developers/locale/tr_TR/fusiondirectory.po b/developers/locale/tr_TR/fusiondirectory.po
index 39cbd97f976c07c918e6e5bcb9d52eee107ce4ab..ef57d41c018e66a80a7ce88c08b4a76acea6b7d1 100644
--- a/developers/locale/tr_TR/fusiondirectory.po
+++ b/developers/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/developers/locale/ug/fusiondirectory.po b/developers/locale/ug/fusiondirectory.po
index 740e47555e20765be9a131ae2f0eee042c167ea9..498ff2cfe6d7ea4012bc21ed92a15818f67a81bb 100644
--- a/developers/locale/ug/fusiondirectory.po
+++ b/developers/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/developers/locale/vi_VN/fusiondirectory.po b/developers/locale/vi_VN/fusiondirectory.po
index f18d8ad6f53b30925bfad6ffec45339ad03cdded..c60e3fc8024980ba33a0aa168cfc838e6dd9a965 100644
--- a/developers/locale/vi_VN/fusiondirectory.po
+++ b/developers/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
diff --git a/developers/locale/zh/fusiondirectory.po b/developers/locale/zh/fusiondirectory.po
index 4e8720a27d5fd08ca6e1a88aa621935f54691cf2..fec21223e0e6096410039b34ef6838bf56e1896c 100644
--- a/developers/locale/zh/fusiondirectory.po
+++ b/developers/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
diff --git a/developers/locale/zh_TW/fusiondirectory.po b/developers/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..3df29e4e6364e052835b9783fccb74bd2a35fb6b
--- /dev/null
+++ b/developers/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,47 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:26
+#: debug-help/addons/debug-help/class_debugHelp.inc:32
+msgid "Debug help"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:27
+msgid "Debug help tools"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:44
+msgid "Diagrams"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:48
+msgid "Object types diagram"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:50
+msgid "Get"
+msgstr ""
+
+#: debug-help/addons/debug-help/class_debugHelp.inc:55
+msgid "Object Types"
+msgstr ""
+
+#: debug-help/addons/debug-help/debughelp.tpl.c:2
+msgid "Insufficient rights"
+msgstr ""
diff --git a/dhcp/locale/af_ZA/fusiondirectory.po b/dhcp/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..5cdcdc2826d2f0ab7b49235da58d3fd90b17a047
--- /dev/null
+++ b/dhcp/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,543 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/dhcp/class_dhcpPlugin.inc:31 admin/dhcp/class_dhcpManagement.inc:34
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/systems/class_dhcpSystem.inc:280
+msgid "DHCP"
+msgstr ""
+
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+msgid "Name"
+msgstr ""
+
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+msgid "Name of this DHCP configuration"
+msgstr ""
+
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
+msgstr ""
+
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
+msgstr ""
+
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
+msgstr ""
+
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
+msgstr ""
+
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+msgid "Comments"
+msgstr ""
+
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+msgid "Comments about this DHCP object"
+msgstr ""
+
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
+msgstr ""
+
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr ""
+
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
+msgstr ""
+
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
+msgstr ""
+
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
+msgid "Create new DHCP section"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:36
+msgid "Expand DHCP subnet"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:37
+msgid "Expand"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:46
+msgid "Fold DHCP subnet"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:47
+msgid "Fold"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
+msgid "Insert new DHCP section"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:576
+msgid "Global options"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:422
+msgid "Error"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:422
+msgid ""
+"The DHCP configuration set is unkown. Please contact your system "
+"administrator."
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:554
+msgid "DHCP Objects"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:564
+msgid "The DHCP sections handled by this server"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:575
+msgid "Logging"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:577
+msgid "Class"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:578
+msgid "Subclass"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/sections/class_dhcpHost.inc:40
+msgid "Host"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:580
+msgid "Group"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Pool"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
+msgid "Subnet"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:583
+msgid "Failover peer"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:584
+msgid "Shared network"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:585
+msgid "DNS update key"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:586
+msgid "DNS update zones"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/sections/class_dhcpHost.inc:30
+msgid "DHCP host"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:43
+#: admin/dhcp/sections/class_dhcpHost.inc:52
+msgid "The client hardware address"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:46
+msgid "The hardware address type"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:49
+msgid "Ethernet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:49
+msgid "FDDI"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:49
+msgid "Token Ring"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:59
+msgid "Hardware address"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:90
+#, php-format
+msgid "\"%s\" is not a valid IP address."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+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:43
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+msgid "Range"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:43
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+msgid ""
+"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."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
+msgid "Permit list"
+msgstr ""
+
+#: 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_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+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:46
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
+msgid "Secret"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
+msgid "Secret to generate TSIG Key"
+msgstr ""
+
+#: 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:46
+msgid "Primary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:47
+msgid "DHCP Secondary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:47
+msgid "Secondary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
+msgstr ""
+
+#: 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: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:50
+msgid "Primary port"
+msgstr ""
+
+#: 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:55
+msgid "Secondary server"
+msgstr ""
+
+#: 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:59
+msgid "Secondary port"
+msgstr ""
+
+#: 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:64
+msgid "Response delay"
+msgstr ""
+
+#: 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:69
+msgid "Unacked updates"
+msgstr ""
+
+#: 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:74
+msgid "Maximum Client Lead Time"
+msgstr ""
+
+#: 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:79
+msgid "Split"
+msgstr ""
+
+#: 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:84
+msgid "HashBucketAssignment"
+msgstr ""
+
+#: 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:88
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
+msgid "Cutoff time in seconds, after which load balance is disabled"
+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: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:57
+msgid "Network address"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
+msgid "Network address of this subnet"
+msgstr ""
+
+#: 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:46
+msgid "Master server of the DNS Zone"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
+msgid "Tsig key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
+msgid "The TSig key DN"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
+msgstr ""
+
+#: 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:55
+msgid "Start service"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:57
+msgid "Stop service"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:59
+msgid "Restart service"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:32
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
+msgid "The Mac address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
+msgid "The IP address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:251
+#, php-format
+msgid "The value for multivaluated field \"%s\" is not an array"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:281
+msgid "Edit the DHCP zones of a system"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:295
+msgid "DHCP zones"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:299
+msgid "DHCP hosts declared for this system"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:363
+#, php-format
+msgid "The ip %s is not in the network %s/%d"
+msgstr ""
+
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
+msgstr ""
+
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
+msgstr ""
+
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
+msgstr ""
+
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
+msgstr ""
diff --git a/dhcp/locale/ar/fusiondirectory.po b/dhcp/locale/ar/fusiondirectory.po
index 6efd62fc8bdfe881979c316dcac6cac611929bd6..1a97b983b56cce97e21153246c2933642c909625 100644
--- a/dhcp/locale/ar/fusiondirectory.po
+++ b/dhcp/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/dhcp/locale/ca/fusiondirectory.po b/dhcp/locale/ca/fusiondirectory.po
index f39e6a27965f55442145cb69b75c09134e85dd79..45900f989de89ea158a1a247f761c3bb6417bb1e 100644
--- a/dhcp/locale/ca/fusiondirectory.po
+++ b/dhcp/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/dhcp/locale/cs_CZ/fusiondirectory.po b/dhcp/locale/cs_CZ/fusiondirectory.po
index 488d45e2a252ec2ae4f0537947fbc24180b58192..64b545013558bd05313ae87492afcf0b3f089de6 100644
--- a/dhcp/locale/cs_CZ/fusiondirectory.po
+++ b/dhcp/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/dhcp/class_dhcpPlugin.inc:31 admin/dhcp/class_dhcpManagement.inc:34
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
diff --git a/dhcp/locale/de/fusiondirectory.po b/dhcp/locale/de/fusiondirectory.po
index f648e695247f6f2ce1fe931052378ce9227cd5db..8da75b2c3c862a81296e86eb069f91c397ab657b 100644
--- a/dhcp/locale/de/fusiondirectory.po
+++ b/dhcp/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Jonah Bohlmann <jokabo66@gmail.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
diff --git a/dhcp/locale/el_GR/fusiondirectory.po b/dhcp/locale/el_GR/fusiondirectory.po
index c82f1a5a5ef4864a8dcd55d0b6d027f8be5d65a4..02a74487cc3030ba30e5af0c2f3fa5c57d90d9a1 100644
--- a/dhcp/locale/el_GR/fusiondirectory.po
+++ b/dhcp/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dhcp/locale/es/fusiondirectory.po b/dhcp/locale/es/fusiondirectory.po
index 8047cffa97e3163bf4450c4762edd0ec749c4589..bd450864835684475baf40aa1bae83a21b2c7445 100644
--- a/dhcp/locale/es/fusiondirectory.po
+++ b/dhcp/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dhcp/locale/es_CO/fusiondirectory.po b/dhcp/locale/es_CO/fusiondirectory.po
index fd03f5fd5d518c8bfcb97b1c7d1fe17508aef58a..23370aed86425e1eaa967241f038f8112ee4a09f 100644
--- a/dhcp/locale/es_CO/fusiondirectory.po
+++ b/dhcp/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dhcp/locale/es_VE/fusiondirectory.po b/dhcp/locale/es_VE/fusiondirectory.po
index 3689a9e068ca2c4412cc85e8f301fce93b802d50..cd46e03c0e9865cd0fdac54441fe41ba8b981e70 100644
--- a/dhcp/locale/es_VE/fusiondirectory.po
+++ b/dhcp/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dhcp/locale/fa_IR/fusiondirectory.po b/dhcp/locale/fa_IR/fusiondirectory.po
index 626484cce361bbb4cabccfd29fc825cb81758ee0..14eb2a81dfa4f663e1fa51054cdf3b8f9572fb32 100644
--- a/dhcp/locale/fa_IR/fusiondirectory.po
+++ b/dhcp/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa_IR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/dhcp/class_dhcpPlugin.inc:31 admin/dhcp/class_dhcpManagement.inc:34
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:39
diff --git a/dhcp/locale/fi_FI/fusiondirectory.po b/dhcp/locale/fi_FI/fusiondirectory.po
index d4fcb4c6b902255a4fc55fae5c2c7b74e7350bdc..3c057fe7e6ec156c84d45b2bf4b84d2b2ad226d0 100644
--- a/dhcp/locale/fi_FI/fusiondirectory.po
+++ b/dhcp/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/dhcp/locale/fr/fusiondirectory.po b/dhcp/locale/fr/fusiondirectory.po
index c49fcb2623243cb61dedad4db64c7034a9c832fb..e3b07d7a6f2af640f32d060d33e0ad03d499b358 100644
--- a/dhcp/locale/fr/fusiondirectory.po
+++ b/dhcp/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/dhcp/locale/hu_HU/fusiondirectory.po b/dhcp/locale/hu_HU/fusiondirectory.po
index f9334e43a292dfc917a8f2b301373e2219f6c108..4464dc153f6d606dee27ddd2d3f1489cf084269d 100644
--- a/dhcp/locale/hu_HU/fusiondirectory.po
+++ b/dhcp/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/dhcp/locale/id/fusiondirectory.po b/dhcp/locale/id/fusiondirectory.po
index 3aad6decec1e03d4b1ac5e720f99afcf5e4c9422..4d2484a6387b298226330b3076858cc2d52ee9a9 100644
--- a/dhcp/locale/id/fusiondirectory.po
+++ b/dhcp/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dhcp/locale/it_IT/fusiondirectory.po b/dhcp/locale/it_IT/fusiondirectory.po
index 4cd65d1c652d5e3489d7b1dffe771be201501b10..e190a94b8463264fd0ae0e5cdc53815ef84bf512 100644
--- a/dhcp/locale/it_IT/fusiondirectory.po
+++ b/dhcp/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/dhcp/locale/ja/fusiondirectory.po b/dhcp/locale/ja/fusiondirectory.po
index b744d92771648f90a9a2de7c21a176e3506a0d7a..d1a943eb6293451582fb0e7b24cb02274e7c4bae 100644
--- a/dhcp/locale/ja/fusiondirectory.po
+++ b/dhcp/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dhcp/locale/ko/fusiondirectory.po b/dhcp/locale/ko/fusiondirectory.po
index 7fffbb35106d5fbe49e5bc3f3395fabc1c7d003d..9522bfc47ea0924d88207fcab002625f9db69401 100644
--- a/dhcp/locale/ko/fusiondirectory.po
+++ b/dhcp/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/dhcp/locale/lv/fusiondirectory.po b/dhcp/locale/lv/fusiondirectory.po
index 9b4c68e3e7eb3d78db137db27eaa2a27d510092c..dec29db5d672268671ebd1b4bbf410805fb415fe 100644
--- a/dhcp/locale/lv/fusiondirectory.po
+++ b/dhcp/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/dhcp/locale/nb/fusiondirectory.po b/dhcp/locale/nb/fusiondirectory.po
index fdcb65a4335953a3a7d008b36762de6a0d500f55..f0cbd95bd05601f0672296b70a50829771298fdb 100644
--- a/dhcp/locale/nb/fusiondirectory.po
+++ b/dhcp/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/dhcp/locale/nl/fusiondirectory.po b/dhcp/locale/nl/fusiondirectory.po
index e766039204a09bd0f91906800e136a5e26fd02f8..14323120207d68ecd25fd793e58b6e2d22e1939a 100644
--- a/dhcp/locale/nl/fusiondirectory.po
+++ b/dhcp/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/dhcp/locale/pl/fusiondirectory.po b/dhcp/locale/pl/fusiondirectory.po
index a7d5f3853e25ad082ed57241c470e10518786cc0..54523b1e700ca6311aebb89d5b32ff3844079b26 100644
--- a/dhcp/locale/pl/fusiondirectory.po
+++ b/dhcp/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dhcp/locale/pt/fusiondirectory.po b/dhcp/locale/pt/fusiondirectory.po
index 94aa242ea19b8ee199ca2705fba1c4618875e405..8fd81c0fa51700612381bf78abbc3c76bc4f601c 100644
--- a/dhcp/locale/pt/fusiondirectory.po
+++ b/dhcp/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/dhcp/locale/pt_BR/fusiondirectory.po b/dhcp/locale/pt_BR/fusiondirectory.po
index e3984f3738cbd58387c1e73edc9a0ab667a5c5a9..27120f8e1b2d9ecdd4e1fd1e50004d6ab5e52143 100644
--- a/dhcp/locale/pt_BR/fusiondirectory.po
+++ b/dhcp/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dhcp/locale/ru/fusiondirectory.po b/dhcp/locale/ru/fusiondirectory.po
index 73949367ef2d7afdb0bb7661a592908315bcebeb..8415b339eeeba056f925ddf36bb5190513895a25 100644
--- a/dhcp/locale/ru/fusiondirectory.po
+++ b/dhcp/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dhcp/locale/ru@petr1708/fusiondirectory.po b/dhcp/locale/ru@petr1708/fusiondirectory.po
index 42dcb783bfedbb4c875e2e659b8005212d0eaefa..d8a6f4765d998d45f2f3f24f2dc7237732daa92f 100644
--- a/dhcp/locale/ru@petr1708/fusiondirectory.po
+++ b/dhcp/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dhcp/locale/sv/fusiondirectory.po b/dhcp/locale/sv/fusiondirectory.po
index 08e4e775d0275fa9f1a2552b736968507b733165..a94d1569d2f37f1f7b3a4fcb9fabd2db06d1b67d 100644
--- a/dhcp/locale/sv/fusiondirectory.po
+++ b/dhcp/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dhcp/locale/tr_TR/fusiondirectory.po b/dhcp/locale/tr_TR/fusiondirectory.po
index e27a6438cf9f95442dd3825fc1b729c368883000..f03c84f2658d6330d836cb3bf165d01b1831513c 100644
--- a/dhcp/locale/tr_TR/fusiondirectory.po
+++ b/dhcp/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dhcp/locale/ug/fusiondirectory.po b/dhcp/locale/ug/fusiondirectory.po
index 138b580a743287ed1d48b5b0c305a6c0c9dbd873..b2203f043e5066c4ac6d2f6773393f96f9825475 100644
--- a/dhcp/locale/ug/fusiondirectory.po
+++ b/dhcp/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dhcp/locale/vi_VN/fusiondirectory.po b/dhcp/locale/vi_VN/fusiondirectory.po
index 6d8f181a20b8bfaa2a44fca92003c2276eedea5e..3d5e4981a6c3e524674ae6bdd44141ac6ceaae47 100644
--- a/dhcp/locale/vi_VN/fusiondirectory.po
+++ b/dhcp/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/dhcp/locale/zh/fusiondirectory.po b/dhcp/locale/zh/fusiondirectory.po
index c0672166d110459de10bee0fb4ff1e23633f1809..e15f650683846f2d9c022720cd42b6417a94447c 100644
--- a/dhcp/locale/zh/fusiondirectory.po
+++ b/dhcp/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dhcp/locale/zh_TW/fusiondirectory.po b/dhcp/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..e60312ef820294bf683601ed6d94258de1c2f9bf
--- /dev/null
+++ b/dhcp/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,543 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/dhcp/class_dhcpPlugin.inc:31 admin/dhcp/class_dhcpManagement.inc:34
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/systems/class_dhcpSystem.inc:280
+msgid "DHCP"
+msgstr ""
+
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/class_dhcpConfiguration.inc:246
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+msgid "Name"
+msgstr ""
+
+#: admin/dhcp/class_dhcpPlugin.inc:34
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+msgid "Name of this DHCP configuration"
+msgstr ""
+
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "Options"
+msgstr ""
+
+#: admin/dhcp/class_dhcpPlugin.inc:39
+msgid "The DHCP options"
+msgstr ""
+
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "Statements"
+msgstr ""
+
+#: admin/dhcp/class_dhcpPlugin.inc:47
+msgid "The DHCP statements"
+msgstr ""
+
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+msgid "Comments"
+msgstr ""
+
+#: admin/dhcp/class_dhcpPlugin.inc:53
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+msgid "Comments about this DHCP object"
+msgstr ""
+
+#: admin/dhcp/class_dhcpManagement.inc:35
+msgid "DHCP Management"
+msgstr ""
+
+#: admin/dhcp/class_dhcpManagement.inc:37
+msgid "Systems"
+msgstr ""
+
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Section"
+msgstr ""
+
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
+msgid "Choose section type to create"
+msgstr ""
+
+#: admin/dhcp/class_dhcpSectionCreationDialog.inc:88
+msgid "Create new DHCP section"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:36
+msgid "Expand DHCP subnet"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:37
+msgid "Expand"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:46
+msgid "Fold DHCP subnet"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:47
+msgid "Fold"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
+msgid "Insert new DHCP section"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:576
+msgid "Global options"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:422
+msgid "Error"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:422
+msgid ""
+"The DHCP configuration set is unkown. Please contact your system "
+"administrator."
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:532
+#: admin/dhcp/class_dhcpConfiguration.inc:533
+#: admin/dhcp/class_dhcpConfiguration.inc:535
+#: config/dhcp/class_dhcpConfig.inc:28
+msgid "DHCP configuration"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:554
+msgid "DHCP Objects"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:564
+msgid "The DHCP sections handled by this server"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:575
+msgid "Logging"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:577
+msgid "Class"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:578
+msgid "Subclass"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:579
+#: admin/dhcp/sections/class_dhcpHost.inc:40
+msgid "Host"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:580
+msgid "Group"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:581
+#: admin/dhcp/sections/class_dhcpPool.inc:39
+msgid "Pool"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:582
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
+msgid "Subnet"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:583
+msgid "Failover peer"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:584
+msgid "Shared network"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:585
+msgid "DNS update key"
+msgstr ""
+
+#: admin/dhcp/class_dhcpConfiguration.inc:586
+msgid "DNS update zones"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/sections/class_dhcpHost.inc:30
+msgid "DHCP host"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:43
+#: admin/dhcp/sections/class_dhcpHost.inc:52
+msgid "The client hardware address"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:46
+msgid "The hardware address type"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:49
+msgid "Ethernet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:49
+msgid "FDDI"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:49
+msgid "Token Ring"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:59
+msgid "Hardware address"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:90
+#, php-format
+msgid "\"%s\" is not a valid IP address."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+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:43
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+msgid "Range"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:43
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+msgid ""
+"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."
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
+msgid "Permit list"
+msgstr ""
+
+#: 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_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+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:46
+msgid "Algorithm to generate TSIG Key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
+msgid "Secret"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
+msgid "Secret to generate TSIG Key"
+msgstr ""
+
+#: 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:46
+msgid "Primary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:47
+msgid "DHCP Secondary"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:47
+msgid "Secondary DHCP server"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
+msgstr ""
+
+#: 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: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:50
+msgid "Primary port"
+msgstr ""
+
+#: 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:55
+msgid "Secondary server"
+msgstr ""
+
+#: 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:59
+msgid "Secondary port"
+msgstr ""
+
+#: 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:64
+msgid "Response delay"
+msgstr ""
+
+#: 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:69
+msgid "Unacked updates"
+msgstr ""
+
+#: 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:74
+msgid "Maximum Client Lead Time"
+msgstr ""
+
+#: 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:79
+msgid "Split"
+msgstr ""
+
+#: 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:84
+msgid "HashBucketAssignment"
+msgstr ""
+
+#: 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:88
+msgid "Load balance time"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
+msgid "Cutoff time in seconds, after which load balance is disabled"
+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: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:57
+msgid "Network address"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
+msgid "Network address of this subnet"
+msgstr ""
+
+#: 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:46
+msgid "Master server of the DNS Zone"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
+msgid "Tsig key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
+msgid "The TSig key DN"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:29
+msgid "DHCP configurations"
+msgstr ""
+
+#: 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:55
+msgid "Start service"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:57
+msgid "Stop service"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:59
+msgid "Restart service"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:32
+msgid ""
+"The DHCP configuration or subsection in which this host should be added"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:36
+#: admin/systems/class_dhcpSystem.inc:109
+msgid "The Mac address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:40
+#: admin/systems/class_dhcpSystem.inc:114
+msgid "The IP address to use in the DHCP host record"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:228
+#, php-format
+msgid ""
+"\"%s\" is locked (by \"%s\" since %s), could not save modifications to this "
+"DHCP configuration"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:251
+#, php-format
+msgid "The value for multivaluated field \"%s\" is not an array"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:281
+msgid "Edit the DHCP zones of a system"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:295
+msgid "DHCP zones"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:299
+msgid "DHCP hosts declared for this system"
+msgstr ""
+
+#: admin/systems/class_dhcpSystem.inc:363
+#, php-format
+msgid "The ip %s is not in the network %s/%d"
+msgstr ""
+
+#: config/dhcp/class_dhcpConfig.inc:29
+msgid "FusionDirectory dhcp plugin configuration"
+msgstr ""
+
+#: config/dhcp/class_dhcpConfig.inc:41
+msgid "DHCP config"
+msgstr ""
+
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "DHCP RDN"
+msgstr ""
+
+#: config/dhcp/class_dhcpConfig.inc:44
+msgid "Branch in which DHCP configurations will be stored"
+msgstr ""
diff --git a/dns/locale/af_ZA/fusiondirectory.po b/dns/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..1ed6d65c2dd957c85d4e23e69481546f0073eb19
--- /dev/null
+++ b/dns/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,634 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
+msgstr ""
+
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
+msgstr ""
+
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
+msgstr ""
+
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
+msgstr ""
+
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
+msgstr ""
+
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
+msgid "DNS"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
+msgid "Could not run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:91
+msgid "More than one server matches the SOA"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:93
+msgid "Could not find the primary server"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:106
+msgid "Could not get run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:368
+#: admin/systems/class_dnsHost.inc:319
+msgid "Error"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
+#: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
+#: admin/dns/class_dnsView.inc:31
+msgid "DNS view"
+msgstr ""
+
+#: admin/dns/class_dnsView.inc:45
+msgid "View"
+msgstr ""
+
+#: admin/dns/class_dnsView.inc:49
+msgid "View name"
+msgstr ""
+
+#: admin/dns/class_dnsView.inc:49
+msgid "Name of this view"
+msgstr ""
+
+#: admin/dns/class_dnsView.inc:53
+msgid "Match clients ACL"
+msgstr ""
+
+#: admin/dns/class_dnsView.inc:53
+msgid ""
+"Name of the ACL to use for the source IP address of the incoming requests"
+msgstr ""
+
+#: admin/dns/class_dnsView.inc:57
+msgid "Match destinations ACL"
+msgstr ""
+
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
+#: admin/dns/class_dnsView.inc:61
+msgid "Match recursive only"
+msgstr ""
+
+#: admin/dns/class_dnsView.inc:61
+msgid "Match only recursive queries in this view"
+msgstr ""
+
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
+msgid "DNS zones"
+msgstr ""
+
+#: admin/dns/class_dnsView.inc:66
+msgid "DNS zones in this view"
+msgstr ""
+
+#: 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 ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:130
+msgid "Type"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:133
+msgid "Reverse zone"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:133
+msgid "Reverse zone this record should be in, if any"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:166
+msgid "LOC Record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:170
+msgid "Latitude"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
+msgid "Degrees"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
+msgid "Minutes"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
+msgid "Seconds"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:189
+msgid "North/South"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:192
+msgid "North"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:192
+msgid "South"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:197
+msgid "Longitude"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:216
+msgid "East/West"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:219
+msgid "East"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:219
+msgid "West"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:224
+msgid "Altitude (meters)"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:229
+msgid "Size (meters)"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:234
+msgid "Horizontal precision (meters)"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:239
+msgid "Vertical precision (meters)"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:250
+msgid "NAPTR Record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:254
+msgid "Order"
+msgstr ""
+
+#: 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:259
+msgid "Preference"
+msgstr ""
+
+#: 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:264
+msgid "Flags"
+msgstr ""
+
+#: 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:268
+msgid "Service"
+msgstr ""
+
+#: 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 ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:272
+msgid "Regular Expression"
+msgstr ""
+
+#: 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:276
+msgid "Replacement"
+msgstr ""
+
+#: 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:287
+msgid "SRV Record"
+msgstr ""
+
+#: 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:296
+msgid "Weight"
+msgstr ""
+
+#: 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:301
+msgid "Port"
+msgstr ""
+
+#: 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: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: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: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:375
+msgid "Redirect to"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:375
+msgid "Domain that this subdomain is an alias of"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:381
+msgid "Content"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:381
+msgid "Content of this record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:431
+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 ""
+
+#: admin/dns/class_dnsZone.inc:30
+#, php-format
+msgid "%s record"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:34 admin/dns/class_dnsZone.inc:35
+msgid "DNS record"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:49
+msgid "Subdomain"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:49
+msgid "Relative subdomain name"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:54
+msgid "DNS Record"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:369
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:471 admin/dns/class_dnsZone.inc:480
+#: admin/dns/class_dnsZone.inc:488 admin/dns/class_dnsZone.inc:496
+#: admin/dns/class_dnsZone.inc:517 admin/dns/class_dnsZone.inc:554
+#: admin/dns/class_dnsZone.inc:560 admin/dns/class_dnsZone.inc:572
+msgid "LDAP error"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:667
+#, 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:670
+#, php-format
+msgid ""
+"\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
+"example.com"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:691 admin/dns/class_dnsZone.inc:692
+#: admin/dns/class_dnsZone.inc:694
+msgid "DNS zone"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:709
+msgid "Zone"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:713
+msgid "Zone name"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:723
+msgid "Reverse zones"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:723
+#, 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:736
+msgid "SOA record"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:739
+msgid "SOA Record"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:743
+msgid "Primary DNS server"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:743
+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:747
+msgid "Mail address"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:747
+msgid ""
+"Domain name which specifies the mailbox of the person responsible for this "
+"zone"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:751
+msgid "Serial number"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:751
+msgid "Version number of the original copy of the zone"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:756
+msgid "Refresh"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:756
+msgid "Time interval before the zone should be refreshed"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:761
+msgid "Retry"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:761
+msgid ""
+"Time interval that should elapse before a failed refresh should be retried"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:766
+msgid "Expire"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:766
+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:771
+msgid "TTL"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:771
+msgid "Minimum TTL field that should be exported with any RR from this zone"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:782
+msgid "Records"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:786
+msgid "The DNS records for this zone"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:124
+msgid "Edit the DNS zones of a system"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:145
+msgid "DNS zones for this host"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:152
+msgid "SOA records"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
+msgid "DNS Records"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:226
+msgid "Primary servers"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:245
+#, php-format
+msgid "The DNS records for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:267
+#, php-format
+msgid "The primary server for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:470 admin/systems/class_dnsHost.inc:491
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr ""
+
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
+msgstr ""
+
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
+msgstr ""
+
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
+msgstr ""
+
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
+msgstr ""
+
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
+msgstr ""
+
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
+msgstr ""
+
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
+msgstr ""
+
+#: admin/systems/dnsrecords.tpl.c:2
+msgid "Insufficient rights"
+msgstr ""
diff --git a/dns/locale/ar/fusiondirectory.po b/dns/locale/ar/fusiondirectory.po
index 9fd5b044e069c30a2f4d5824d5b06fc86c8bc08a..7d9b62a84e0ff03e6418f77ba7e0302c8c3daa56 100644
--- a/dns/locale/ar/fusiondirectory.po
+++ b/dns/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/dns/locale/ca/fusiondirectory.po b/dns/locale/ca/fusiondirectory.po
index cb3a883d5eab3b1686d84bcb1c91a7620a8ebb1c..2f9cff67e537eeb88d14b083f1e672c9c83c7be6 100644
--- a/dns/locale/ca/fusiondirectory.po
+++ b/dns/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/dns/locale/cs_CZ/fusiondirectory.po b/dns/locale/cs_CZ/fusiondirectory.po
index 5536e7f981c0c814ec58324d59cbbdbb9f1851f9..67b4f1d14190f5e71d4e135ebfe955b954ccda2d 100644
--- a/dns/locale/cs_CZ/fusiondirectory.po
+++ b/dns/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
 #: admin/dns/class_dnsAcl.inc:33
diff --git a/dns/locale/de/fusiondirectory.po b/dns/locale/de/fusiondirectory.po
index d96ccaf828d1a440551742e871ed786106fa5a29..2e5ad5d29d68bb6ef606a78cb26955e01fdf059c 100644
--- a/dns/locale/de/fusiondirectory.po
+++ b/dns/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dns/locale/el_GR/fusiondirectory.po b/dns/locale/el_GR/fusiondirectory.po
index 28141c22011173b31bb6187f3f1e053ecac86156..076e377578590886f32a46ecdd179dc92570fe2c 100644
--- a/dns/locale/el_GR/fusiondirectory.po
+++ b/dns/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dns/locale/es/fusiondirectory.po b/dns/locale/es/fusiondirectory.po
index 0bc5707f35a9e3b9324fe5d5c78b176e673e5ea9..4aab58f5fe2ef72dca9268097983834a089b4200 100644
--- a/dns/locale/es/fusiondirectory.po
+++ b/dns/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dns/locale/es_CO/fusiondirectory.po b/dns/locale/es_CO/fusiondirectory.po
index 0222c1092e6c9e81f007681689e34eeb79d2c152..825910694df1a6559b4cac6935808562f0f8f616 100644
--- a/dns/locale/es_CO/fusiondirectory.po
+++ b/dns/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dns/locale/es_VE/fusiondirectory.po b/dns/locale/es_VE/fusiondirectory.po
index cee84a33bed0acc65de19402be420b3e6f9a6e8e..d39422ee7b35682bcb97a3f5b54294dff70f43d9 100644
--- a/dns/locale/es_VE/fusiondirectory.po
+++ b/dns/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dns/locale/fa_IR/fusiondirectory.po b/dns/locale/fa_IR/fusiondirectory.po
index fa7bfe9af1070a84e111ac073dceb8a8316ab177..5bfe9b06a33740d5c727fdf090793e1f03ce2d56 100644
--- a/dns/locale/fa_IR/fusiondirectory.po
+++ b/dns/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa_IR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
 #: admin/dns/class_dnsAcl.inc:33
diff --git a/dns/locale/fi_FI/fusiondirectory.po b/dns/locale/fi_FI/fusiondirectory.po
index 58980c4592002a5b1ca4b2f67b553423650f95c0..1cd5eb4481b365065b6eefb3ced8a9b8332bb8fb 100644
--- a/dns/locale/fi_FI/fusiondirectory.po
+++ b/dns/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/dns/locale/fr/fusiondirectory.po b/dns/locale/fr/fusiondirectory.po
index e7e64493f80b7f462d604de01ce3b314690d6e8f..e74b6efac27c712a3c8f633647c771897148fac6 100644
--- a/dns/locale/fr/fusiondirectory.po
+++ b/dns/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dns/locale/hu_HU/fusiondirectory.po b/dns/locale/hu_HU/fusiondirectory.po
index 8cdbd54673db608fad948cb11d03b010c82ceb2d..bb3a7dbba3cc46517311f0a88e140af5f4f10506 100644
--- a/dns/locale/hu_HU/fusiondirectory.po
+++ b/dns/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dns/locale/id/fusiondirectory.po b/dns/locale/id/fusiondirectory.po
index a1300203754bbb588d79f0227de3e40d9615d23a..1971f763a2ce4e2d58198c0bb752fd31270b75b0 100644
--- a/dns/locale/id/fusiondirectory.po
+++ b/dns/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dns/locale/it_IT/fusiondirectory.po b/dns/locale/it_IT/fusiondirectory.po
index e5a7632d8b951ad3636673f6a081610628e60de0..3c0502fd57e861fe1cbc49f964d843f0992b456b 100644
--- a/dns/locale/it_IT/fusiondirectory.po
+++ b/dns/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/dns/locale/ja/fusiondirectory.po b/dns/locale/ja/fusiondirectory.po
index 7c08abb327d6a4e142449ef909bf76b527e4f0a3..6d8c3e059c9f076ee9fa397b3b34b0a5166833a8 100644
--- a/dns/locale/ja/fusiondirectory.po
+++ b/dns/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dns/locale/ko/fusiondirectory.po b/dns/locale/ko/fusiondirectory.po
index 5878b3972eee600b20c3a591d399bd0bcde27f22..3f11c2ffbd6a3a53edb78e3e7974f239fd8e3f3d 100644
--- a/dns/locale/ko/fusiondirectory.po
+++ b/dns/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/dns/locale/lv/fusiondirectory.po b/dns/locale/lv/fusiondirectory.po
index e3380502b580707beeb2d224f1fde140ca931cc6..e6d2ac1a6d669494c2886d034fb048a8f06cc258 100644
--- a/dns/locale/lv/fusiondirectory.po
+++ b/dns/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/dns/locale/nb/fusiondirectory.po b/dns/locale/nb/fusiondirectory.po
index 156e13d5d672eae3cee7a769d50722bcc84bb6ef..0c4e85ff93e399f59c8b75c29eaf8b6638a916ac 100644
--- a/dns/locale/nb/fusiondirectory.po
+++ b/dns/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/dns/locale/nl/fusiondirectory.po b/dns/locale/nl/fusiondirectory.po
index 36dc3143d3304c2ac172076808ae5244922973ed..bd890f1b5b5e8a6712e62410c5b680a47d295850 100644
--- a/dns/locale/nl/fusiondirectory.po
+++ b/dns/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Lucien Antonissen <lucien.antonissen@digipolis.be>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/dns/locale/pl/fusiondirectory.po b/dns/locale/pl/fusiondirectory.po
index e3d8755ad4a258e1379c8555d60733a3ca370ea0..756bd5d9453845e26f008b036939d3c9e5b9cbcb 100644
--- a/dns/locale/pl/fusiondirectory.po
+++ b/dns/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dns/locale/pt/fusiondirectory.po b/dns/locale/pt/fusiondirectory.po
index d3ecf7e5a2568194cf3b9a28267ab28627dcbf19..4756673686504b9c9d8e82a30f11e59cc33123ba 100644
--- a/dns/locale/pt/fusiondirectory.po
+++ b/dns/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/dns/locale/pt_BR/fusiondirectory.po b/dns/locale/pt_BR/fusiondirectory.po
index e7b4e892f4f4130e38edae73b74b513c77e5c561..c4c88cf7614c22d73d1dd8718e6e611ef977d835 100644
--- a/dns/locale/pt_BR/fusiondirectory.po
+++ b/dns/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dns/locale/ru/fusiondirectory.po b/dns/locale/ru/fusiondirectory.po
index c184cb9ec7d8df5f34161a075377b03c6d8cd1cb..a505195e664fc3db8f86ffb85b9799a7c0d22fa9 100644
--- a/dns/locale/ru/fusiondirectory.po
+++ b/dns/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dns/locale/ru@petr1708/fusiondirectory.po b/dns/locale/ru@petr1708/fusiondirectory.po
index ed7825b3a1954b93546c90f4146e3ec160db85da..58bc587634351c2c0be3ec371e7e35dc0775cbeb 100644
--- a/dns/locale/ru@petr1708/fusiondirectory.po
+++ b/dns/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dns/locale/sv/fusiondirectory.po b/dns/locale/sv/fusiondirectory.po
index e35eca4848a2bddd263b0c73c1fc237692ce9b18..2d9c85f20b9b8388bf90da107b65baa45f468ccb 100644
--- a/dns/locale/sv/fusiondirectory.po
+++ b/dns/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dns/locale/tr_TR/fusiondirectory.po b/dns/locale/tr_TR/fusiondirectory.po
index 576637eed2b453686ebb4b30a379c13abacaa93a..2cc99a0e35ee199359ce4c317cc29afca7449ffa 100644
--- a/dns/locale/tr_TR/fusiondirectory.po
+++ b/dns/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dns/locale/ug/fusiondirectory.po b/dns/locale/ug/fusiondirectory.po
index fad5edb2f319b4a91258c194712bfc91026d846a..e7c6d7eca810d614dfc1e9d10670fb5a6851f9c4 100644
--- a/dns/locale/ug/fusiondirectory.po
+++ b/dns/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dns/locale/vi_VN/fusiondirectory.po b/dns/locale/vi_VN/fusiondirectory.po
index 521732eda09a1cf0a64f58287151e57a5a90302c..ba4765e31b68345637f69343668e41dec95d4146 100644
--- a/dns/locale/vi_VN/fusiondirectory.po
+++ b/dns/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/dns/locale/zh/fusiondirectory.po b/dns/locale/zh/fusiondirectory.po
index 007fb744d799818eaa2dd1d8a8cd3d4f2a73f631..50f4e04feee0fdd0ce28d3d7aa6d07437bacb5b7 100644
--- a/dns/locale/zh/fusiondirectory.po
+++ b/dns/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dns/locale/zh_TW/fusiondirectory.po b/dns/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..80a681c0c46f2b7a4ab106cd852871768e2fb4df
--- /dev/null
+++ b/dns/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,634 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
+#: admin/dns/class_dnsAcl.inc:33
+msgid "DNS acl"
+msgstr ""
+
+#: admin/dns/class_dnsAcl.inc:47
+msgid "Acl"
+msgstr ""
+
+#: admin/dns/class_dnsAcl.inc:51
+msgid "ACL name"
+msgstr ""
+
+#: admin/dns/class_dnsAcl.inc:51
+msgid "Name of this acl"
+msgstr ""
+
+#: admin/dns/class_dnsAcl.inc:56
+msgid "Address match list"
+msgstr ""
+
+#: admin/dns/class_dnsAcl.inc:56
+msgid "The ip address match list for this acl"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:123
+msgid "DNS"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:35
+msgid "DNS Management"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:37
+msgid "Systems"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:91 admin/dns/class_dnsManagement.inc:93
+#: admin/dns/class_dnsManagement.inc:99 admin/systems/class_dnsHost.inc:307
+#: admin/systems/class_dnsHost.inc:313
+msgid "Could not run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:91
+msgid "More than one server matches the SOA"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:93
+msgid "Could not find the primary server"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:106
+msgid "Could not get run ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
+msgid "Ldap2zone"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:108 admin/systems/class_dnsHost.inc:315
+#, php-format
+msgid "Ldap2Zone called for zone \"%s\""
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112 admin/dns/class_dnsZone.inc:368
+#: admin/systems/class_dnsHost.inc:319
+msgid "Error"
+msgstr ""
+
+#: admin/dns/class_dnsManagement.inc:112 admin/systems/class_dnsHost.inc:319
+msgid "Argonaut client needs to be activated to use ldap2zone remotely"
+msgstr ""
+
+#: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
+#: admin/dns/class_dnsView.inc:31
+msgid "DNS view"
+msgstr ""
+
+#: admin/dns/class_dnsView.inc:45
+msgid "View"
+msgstr ""
+
+#: admin/dns/class_dnsView.inc:49
+msgid "View name"
+msgstr ""
+
+#: admin/dns/class_dnsView.inc:49
+msgid "Name of this view"
+msgstr ""
+
+#: admin/dns/class_dnsView.inc:53
+msgid "Match clients ACL"
+msgstr ""
+
+#: admin/dns/class_dnsView.inc:53
+msgid ""
+"Name of the ACL to use for the source IP address of the incoming requests"
+msgstr ""
+
+#: admin/dns/class_dnsView.inc:57
+msgid "Match destinations ACL"
+msgstr ""
+
+#: admin/dns/class_dnsView.inc:57
+msgid ""
+"Name of the ACL to use for the destination IP address of the incoming "
+"requests"
+msgstr ""
+
+#: admin/dns/class_dnsView.inc:61
+msgid "Match recursive only"
+msgstr ""
+
+#: admin/dns/class_dnsView.inc:61
+msgid "Match only recursive queries in this view"
+msgstr ""
+
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:141
+msgid "DNS zones"
+msgstr ""
+
+#: admin/dns/class_dnsView.inc:66
+msgid "DNS zones in this view"
+msgstr ""
+
+#: 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 ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:130
+msgid "Type"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:133
+msgid "Reverse zone"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:133
+msgid "Reverse zone this record should be in, if any"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:166
+msgid "LOC Record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:170
+msgid "Latitude"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
+msgid "Degrees"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
+msgid "Minutes"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
+msgid "Seconds"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:189
+msgid "North/South"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:192
+msgid "North"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:192
+msgid "South"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:197
+msgid "Longitude"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:216
+msgid "East/West"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:219
+msgid "East"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:219
+msgid "West"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:224
+msgid "Altitude (meters)"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:229
+msgid "Size (meters)"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:234
+msgid "Horizontal precision (meters)"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:239
+msgid "Vertical precision (meters)"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:250
+msgid "NAPTR Record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:254
+msgid "Order"
+msgstr ""
+
+#: 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:259
+msgid "Preference"
+msgstr ""
+
+#: 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:264
+msgid "Flags"
+msgstr ""
+
+#: 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:268
+msgid "Service"
+msgstr ""
+
+#: 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 ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:272
+msgid "Regular Expression"
+msgstr ""
+
+#: 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:276
+msgid "Replacement"
+msgstr ""
+
+#: 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:287
+msgid "SRV Record"
+msgstr ""
+
+#: 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:296
+msgid "Weight"
+msgstr ""
+
+#: 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:301
+msgid "Port"
+msgstr ""
+
+#: 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: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: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: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:375
+msgid "Redirect to"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:375
+msgid "Domain that this subdomain is an alias of"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:381
+msgid "Content"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:381
+msgid "Content of this record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:431
+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 ""
+
+#: admin/dns/class_dnsZone.inc:30
+#, php-format
+msgid "%s record"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:34 admin/dns/class_dnsZone.inc:35
+msgid "DNS record"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:49
+msgid "Subdomain"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:49
+msgid "Relative subdomain name"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:54
+msgid "DNS Record"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:369
+#, php-format
+msgid "The IP %s does not match the selected reverse %s, it has been ignored"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:471 admin/dns/class_dnsZone.inc:480
+#: admin/dns/class_dnsZone.inc:488 admin/dns/class_dnsZone.inc:496
+#: admin/dns/class_dnsZone.inc:517 admin/dns/class_dnsZone.inc:554
+#: admin/dns/class_dnsZone.inc:560 admin/dns/class_dnsZone.inc:572
+msgid "LDAP error"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:667
+#, 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:670
+#, php-format
+msgid ""
+"\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
+"example.com"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:691 admin/dns/class_dnsZone.inc:692
+#: admin/dns/class_dnsZone.inc:694
+msgid "DNS zone"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:709
+msgid "Zone"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:713
+msgid "Zone name"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:723
+msgid "Reverse zones"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:723
+#, 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:736
+msgid "SOA record"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:739
+msgid "SOA Record"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:743
+msgid "Primary DNS server"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:743
+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:747
+msgid "Mail address"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:747
+msgid ""
+"Domain name which specifies the mailbox of the person responsible for this "
+"zone"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:751
+msgid "Serial number"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:751
+msgid "Version number of the original copy of the zone"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:756
+msgid "Refresh"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:756
+msgid "Time interval before the zone should be refreshed"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:761
+msgid "Retry"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:761
+msgid ""
+"Time interval that should elapse before a failed refresh should be retried"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:766
+msgid "Expire"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:766
+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:771
+msgid "TTL"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:771
+msgid "Minimum TTL field that should be exported with any RR from this zone"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:782
+msgid "Records"
+msgstr ""
+
+#: admin/dns/class_dnsZone.inc:786
+msgid "The DNS records for this zone"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:124
+msgid "Edit the DNS zones of a system"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:145
+msgid "DNS zones for this host"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:152
+msgid "SOA records"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:156 admin/systems/class_dnsHost.inc:230
+msgid "DNS Records"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:226
+msgid "Primary servers"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:245
+#, php-format
+msgid "The DNS records for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:267
+#, php-format
+msgid "The primary server for zone \"%s\""
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:364 admin/systems/class_dnsHost.inc:383
+#, php-format
+msgid "%d records were updated from %s to %s in zone %s"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:396 admin/systems/class_dnsHost.inc:425
+msgid "DNS update"
+msgstr ""
+
+#: admin/systems/class_dnsHost.inc:470 admin/systems/class_dnsHost.inc:491
+#, php-format
+msgid "%d records were removed in zone %s"
+msgstr ""
+
+#: config/dns/class_dnsConfig.inc:28
+msgid "DNS configuration"
+msgstr ""
+
+#: config/dns/class_dnsConfig.inc:29
+msgid "FusionDirectory dns plugin configuration"
+msgstr ""
+
+#: config/dns/class_dnsConfig.inc:42
+msgid "DNS config"
+msgstr ""
+
+#: config/dns/class_dnsConfig.inc:45
+msgid "DNS RDN"
+msgstr ""
+
+#: config/dns/class_dnsConfig.inc:45
+msgid "Branch in which DNS zones will be stored"
+msgstr ""
+
+#: config/dns/class_dnsConfig.inc:50
+msgid "Store final dot in domains"
+msgstr ""
+
+#: config/dns/class_dnsConfig.inc:50
+msgid "Should FD store a final dot at the end of domains?"
+msgstr ""
+
+#: admin/systems/dnsrecords.tpl.c:2
+msgid "Insufficient rights"
+msgstr ""
diff --git a/dovecot/locale/af_ZA/fusiondirectory.po b/dovecot/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..d2b06cc4e6e174dd79d7a7c4601337e76763e3d2
--- /dev/null
+++ b/dovecot/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,120 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:28
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:29
+msgid "Dovecot (IMAP/POP3)"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:29
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:43
+msgid "Dovecot connection"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:46
+msgid "Connect URL for Dovecot server"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:50
+msgid "Hostname"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:50
+msgid "Hostname of the Dovecot server"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:54
+msgid "Port"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:54
+msgid "Port number on which Dovecot server should be contacted"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:59
+msgid "Option"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:59
+msgid "Options for contacting Dovecot server"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:64
+msgid "Validate TLS/SSL Certificates"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:64
+msgid "Weither or not to validate server certificates on connection"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:76
+msgid "Master credentials"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:79
+msgid "Admin user"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:79
+msgid "Dovecot server admin user"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:83
+msgid "Password"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:83
+msgid "Admin user password"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:87
+msgid "Mail directory"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:87
+msgid "Path to the directory in which user maildirs must be created"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:94
+msgid "Options"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:97
+msgid "Create the user folder via Argonaut"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:97
+msgid "Use argonaut to create the user mailbox on the Dovecot server"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr ""
diff --git a/dovecot/locale/ar/fusiondirectory.po b/dovecot/locale/ar/fusiondirectory.po
index 465c9f9571cd259ac78b4e6dc953779c368fa3bd..f3d0bf965a95f81c4c42cec17d869972aa4cbd00 100644
--- a/dovecot/locale/ar/fusiondirectory.po
+++ b/dovecot/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/dovecot/locale/ca/fusiondirectory.po b/dovecot/locale/ca/fusiondirectory.po
index 3bfbedf1093dbf47b30019e1649a0a080dc03322..ae1070c93f52635143a6f9d69d5b7a19b9445f19 100644
--- a/dovecot/locale/ca/fusiondirectory.po
+++ b/dovecot/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/dovecot/locale/cs_CZ/fusiondirectory.po b/dovecot/locale/cs_CZ/fusiondirectory.po
index af9e4db0adea87ea28572bfb75017d4b913fba56..a738c218d49dfc99b80ba6fc502095fee3d06bfc 100644
--- a/dovecot/locale/cs_CZ/fusiondirectory.po
+++ b/dovecot/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
diff --git a/dovecot/locale/de/fusiondirectory.po b/dovecot/locale/de/fusiondirectory.po
index 29691bcc757adc7326b438a9cd3b12932b5bf3d8..a3a4a387970a2eb66c34475832fc4babce949697 100644
--- a/dovecot/locale/de/fusiondirectory.po
+++ b/dovecot/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dovecot/locale/el_GR/fusiondirectory.po b/dovecot/locale/el_GR/fusiondirectory.po
index 39aa3f31a76788b8e9f2c77f7756757aa946da0c..132fb3734ad8ccfa0a5703d923b9b9c81a10bc39 100644
--- a/dovecot/locale/el_GR/fusiondirectory.po
+++ b/dovecot/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dovecot/locale/es/fusiondirectory.po b/dovecot/locale/es/fusiondirectory.po
index 81efee05eb801813eb01764a7c454ff29b7bfb98..401c8e3d63f314d216e969399d9a2baa847e945f 100644
--- a/dovecot/locale/es/fusiondirectory.po
+++ b/dovecot/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dovecot/locale/es_CO/fusiondirectory.po b/dovecot/locale/es_CO/fusiondirectory.po
index b1311ace418294f76eb9abe5f871d678402f2ee5..eda8eba92247b0ea3894367fa3a006a5727af6c0 100644
--- a/dovecot/locale/es_CO/fusiondirectory.po
+++ b/dovecot/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dovecot/locale/es_VE/fusiondirectory.po b/dovecot/locale/es_VE/fusiondirectory.po
index 6721d1603cd4a4a66ee0350c9585895acbaff65c..a4170884e99136ecc67eec734735cbef69ddc13b 100644
--- a/dovecot/locale/es_VE/fusiondirectory.po
+++ b/dovecot/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dovecot/locale/fa_IR/fusiondirectory.po b/dovecot/locale/fa_IR/fusiondirectory.po
index d8fa78f9e0bb10b016deec07edd19278653ed662..a3593e88c4c388bc50559a3be62f211eeb7a461a 100644
--- a/dovecot/locale/fa_IR/fusiondirectory.po
+++ b/dovecot/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
diff --git a/dovecot/locale/fi_FI/fusiondirectory.po b/dovecot/locale/fi_FI/fusiondirectory.po
index 98a3f56a014aca012c9068bd81cb3fb1005a3a48..36c305cff9a704dcea02cc56fa978f7f2ed5da63 100644
--- a/dovecot/locale/fi_FI/fusiondirectory.po
+++ b/dovecot/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/dovecot/locale/fr/fusiondirectory.po b/dovecot/locale/fr/fusiondirectory.po
index 0e3308788f332809ef23af712dca18e5457b1480..1102ac9a1d9ad28a4b1d9a34ccbfd3f6a8746b7d 100644
--- a/dovecot/locale/fr/fusiondirectory.po
+++ b/dovecot/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/dovecot/locale/hu_HU/fusiondirectory.po b/dovecot/locale/hu_HU/fusiondirectory.po
index e5dbcccb45fbca08ec444170b602bfadde088252..c968e1418fe4a1f7e35fd35b9794f733b8dd3128 100644
--- a/dovecot/locale/hu_HU/fusiondirectory.po
+++ b/dovecot/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dovecot/locale/id/fusiondirectory.po b/dovecot/locale/id/fusiondirectory.po
index 4e25dda4b8a97959f258852c57714f9e8bddeef4..3fd2c01b493ba2c820fd3035bf4eb9d4c676b799 100644
--- a/dovecot/locale/id/fusiondirectory.po
+++ b/dovecot/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dovecot/locale/it_IT/fusiondirectory.po b/dovecot/locale/it_IT/fusiondirectory.po
index 160820d8199ecf20a4b02ebf761af266e4cfdc4e..b856a00992a6daf37c86272fbc0094e2888bf2b3 100644
--- a/dovecot/locale/it_IT/fusiondirectory.po
+++ b/dovecot/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/dovecot/locale/ja/fusiondirectory.po b/dovecot/locale/ja/fusiondirectory.po
index dd04b7d7ea0920a37ff090af8d6778c8b1432e48..f53b1506faefa84c76b20ccf7f1ec6f60fec6182 100644
--- a/dovecot/locale/ja/fusiondirectory.po
+++ b/dovecot/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dovecot/locale/ko/fusiondirectory.po b/dovecot/locale/ko/fusiondirectory.po
index 36fa58167671506e438854fd4d08609fa6f3a226..9e12e4955e362e70df43fa24ba074bf941db97de 100644
--- a/dovecot/locale/ko/fusiondirectory.po
+++ b/dovecot/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/dovecot/locale/lv/fusiondirectory.po b/dovecot/locale/lv/fusiondirectory.po
index 41b7083f189f12f3227a46dd392db8ccd426c3c7..793d4d3b0fbd104f286b1ce0ddab0276b041ea7b 100644
--- a/dovecot/locale/lv/fusiondirectory.po
+++ b/dovecot/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dovecot/locale/nb/fusiondirectory.po b/dovecot/locale/nb/fusiondirectory.po
index 0e919dd8a1ef6cfecb7ecc313ee44dc72cc69f61..6ec3fc6c7660e23d65bc707301f76584aadfc2f6 100644
--- a/dovecot/locale/nb/fusiondirectory.po
+++ b/dovecot/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dovecot/locale/nl/fusiondirectory.po b/dovecot/locale/nl/fusiondirectory.po
index f5b51e7dcb7c9f823cb28406b1b5e40a3b1bb771..2ea2a74defb5bff9e9cfcb478b897d2618850097 100644
--- a/dovecot/locale/nl/fusiondirectory.po
+++ b/dovecot/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/dovecot/locale/pl/fusiondirectory.po b/dovecot/locale/pl/fusiondirectory.po
index 86428d9a56f0c99118380186230569e2e9d630a9..409a4d1b3d02a8abf3d18bb0bff97b61ffb646fc 100644
--- a/dovecot/locale/pl/fusiondirectory.po
+++ b/dovecot/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dovecot/locale/pt/fusiondirectory.po b/dovecot/locale/pt/fusiondirectory.po
index 5fea98ee95b362501a10dcd3a1a4c111af49554f..af8926632c030bdb9e13626a2b525c6a4eee05ec 100644
--- a/dovecot/locale/pt/fusiondirectory.po
+++ b/dovecot/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/dovecot/locale/pt_BR/fusiondirectory.po b/dovecot/locale/pt_BR/fusiondirectory.po
index fbb174180b3393bfa2d9583fa06dad15e9894f86..91f8c8ae91cf36c96d6b613545e9bdd8876b2957 100644
--- a/dovecot/locale/pt_BR/fusiondirectory.po
+++ b/dovecot/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dovecot/locale/ru/fusiondirectory.po b/dovecot/locale/ru/fusiondirectory.po
index e76a29ce17186d8bdcba64ba42356e5be54cf3aa..9fff095b4b08eaee478637a3aa7f27a646b2d863 100644
--- a/dovecot/locale/ru/fusiondirectory.po
+++ b/dovecot/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dovecot/locale/ru@petr1708/fusiondirectory.po b/dovecot/locale/ru@petr1708/fusiondirectory.po
index d09f95c25a814420dccea6bbe2146e60b40492c5..3f8024a33a115b861a1f4a03c7bfdd5c27b20fdc 100644
--- a/dovecot/locale/ru@petr1708/fusiondirectory.po
+++ b/dovecot/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dovecot/locale/sv/fusiondirectory.po b/dovecot/locale/sv/fusiondirectory.po
index 4f500c4453e886416279b8a0b037fac4c6f7ce26..7fffbb4a0388f8975846958dfcd4c02bc0d8c6be 100644
--- a/dovecot/locale/sv/fusiondirectory.po
+++ b/dovecot/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dovecot/locale/tr_TR/fusiondirectory.po b/dovecot/locale/tr_TR/fusiondirectory.po
index 9f4f83e939d2d3a38e5050a483665229fd230a83..8bbd212a2a40898e4a44b724962af69f2793ab91 100644
--- a/dovecot/locale/tr_TR/fusiondirectory.po
+++ b/dovecot/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dovecot/locale/ug/fusiondirectory.po b/dovecot/locale/ug/fusiondirectory.po
index b1f1a406ba270af9c53bedc75d8393b2ec1f2ca2..80f624343ab338622e028681622acd77490aad33 100644
--- a/dovecot/locale/ug/fusiondirectory.po
+++ b/dovecot/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dovecot/locale/vi_VN/fusiondirectory.po b/dovecot/locale/vi_VN/fusiondirectory.po
index 8a89c338a24247935656b374adf92ac1b1f84634..2bfbdda702c06fbba92d0a890b7898d1bf334bf0 100644
--- a/dovecot/locale/vi_VN/fusiondirectory.po
+++ b/dovecot/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/dovecot/locale/zh/fusiondirectory.po b/dovecot/locale/zh/fusiondirectory.po
index 31d3d8c3b251a451ebab9fe598a0bd088d591f8d..e35689294fe43b61346cc7dffb09041631bcccea 100644
--- a/dovecot/locale/zh/fusiondirectory.po
+++ b/dovecot/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dovecot/locale/zh_TW/fusiondirectory.po b/dovecot/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..40e311268de3ea0e6dcdb60b74af90ea30146bc5
--- /dev/null
+++ b/dovecot/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,120 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:28
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:29
+msgid "Dovecot (IMAP/POP3)"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:29
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:43
+msgid "Dovecot connection"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:46
+msgid "Connect URL for Dovecot server"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:50
+msgid "Hostname"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:50
+msgid "Hostname of the Dovecot server"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:54
+msgid "Port"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:54
+msgid "Port number on which Dovecot server should be contacted"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:59
+msgid "Option"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:59
+msgid "Options for contacting Dovecot server"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:64
+msgid "Validate TLS/SSL Certificates"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:64
+msgid "Weither or not to validate server certificates on connection"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:76
+msgid "Master credentials"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:79
+msgid "Admin user"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:79
+msgid "Dovecot server admin user"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:83
+msgid "Password"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:83
+msgid "Admin user password"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:87
+msgid "Mail directory"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:87
+msgid "Path to the directory in which user maildirs must be created"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:94
+msgid "Options"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:97
+msgid "Create the user folder via Argonaut"
+msgstr ""
+
+#: admin/systems/services/dovecot/class_serviceDovecot.inc:97
+msgid "Use argonaut to create the user mailbox on the Dovecot server"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
+msgid "There are no IMAP compatible mail servers defined!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
+msgid "Mail server for this account is invalid!"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
+#, php-format
+msgid "Error while trying to contact Dovecot server through Argonaut: %s"
+msgstr ""
diff --git a/dsa/locale/af_ZA/fusiondirectory.po b/dsa/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..3d1c0356d37d061dc21fe2ae4023998fb679f890
--- /dev/null
+++ b/dsa/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,74 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
+#: config/dsa/class_dsaConfig.inc:42
+msgid "DSA"
+msgstr ""
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr ""
+
+#: 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 ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:55
+msgid "Entry name"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:55
+msgid "Account name"
+msgstr ""
+
+#: 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:68
+msgid "Password"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr ""
diff --git a/dsa/locale/ar/fusiondirectory.po b/dsa/locale/ar/fusiondirectory.po
index 0f9ac9dc1a4e174606aebe61e93cf387316f10e1..f107633873b8aa5a40c5d618d17426a3054b5cd1 100644
--- a/dsa/locale/ar/fusiondirectory.po
+++ b/dsa/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/dsa/locale/ca/fusiondirectory.po b/dsa/locale/ca/fusiondirectory.po
index 393331d825567fff4ccc2cda6657fdfb6f75d0f0..6c70b60fb82e53ddd4bff25dbdc13b3854ccec12 100644
--- a/dsa/locale/ca/fusiondirectory.po
+++ b/dsa/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/dsa/locale/cs_CZ/fusiondirectory.po b/dsa/locale/cs_CZ/fusiondirectory.po
index c155ae361d68e7cb0a4be16314ac565b539511dd..4923eb12bfef2f984aa7ee76d15e09516cfd0124 100644
--- a/dsa/locale/cs_CZ/fusiondirectory.po
+++ b/dsa/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
 #: config/dsa/class_dsaConfig.inc:42
diff --git a/dsa/locale/de/fusiondirectory.po b/dsa/locale/de/fusiondirectory.po
index 94fbc8e3e320b26e13f8e5c0c1055c5ff74625cf..6cbb33cd66d9f267dbc383bc2a7b381f28d4efab 100644
--- a/dsa/locale/de/fusiondirectory.po
+++ b/dsa/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dsa/locale/el_GR/fusiondirectory.po b/dsa/locale/el_GR/fusiondirectory.po
index d9545318d091260698a37f762056adeec06df5d6..157995d36019e9ce4f17c3eafc2ee622e3ebc159 100644
--- a/dsa/locale/el_GR/fusiondirectory.po
+++ b/dsa/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dsa/locale/es/fusiondirectory.po b/dsa/locale/es/fusiondirectory.po
index bc9a3165b3ad6aa715084e87b5e2b4b70db21b9c..9d475317e51b0fb734ac2dfefc0918ebbb2280d6 100644
--- a/dsa/locale/es/fusiondirectory.po
+++ b/dsa/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dsa/locale/es_CO/fusiondirectory.po b/dsa/locale/es_CO/fusiondirectory.po
index 57d0f0a35e435e0df8e531e4021cc6ef87d6cc0b..d2d347c07ac33cc6ee2c9867dc800861f2ff3a0b 100644
--- a/dsa/locale/es_CO/fusiondirectory.po
+++ b/dsa/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dsa/locale/es_VE/fusiondirectory.po b/dsa/locale/es_VE/fusiondirectory.po
index e45dc590a2e43c704b1e6d8acdf518e08a3e0f04..e87c45ec47c731c4dcc76370e09d99c84435eb80 100644
--- a/dsa/locale/es_VE/fusiondirectory.po
+++ b/dsa/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dsa/locale/fa_IR/fusiondirectory.po b/dsa/locale/fa_IR/fusiondirectory.po
index ff92a74ddb7fd08e1fc76549b69bc0cf9c3c55d0..05f8c7af3ba0d1e452ab862d09c0c080c34b70f0 100644
--- a/dsa/locale/fa_IR/fusiondirectory.po
+++ b/dsa/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
 #: config/dsa/class_dsaConfig.inc:42
diff --git a/dsa/locale/fi_FI/fusiondirectory.po b/dsa/locale/fi_FI/fusiondirectory.po
index 27371aa2bc36735f529617308a57c4512c349795..d69678e2a164166ec1c1c615c52f98db3ffc47bd 100644
--- a/dsa/locale/fi_FI/fusiondirectory.po
+++ b/dsa/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/dsa/locale/fr/fusiondirectory.po b/dsa/locale/fr/fusiondirectory.po
index 16051b3c28feb9df8e9a2d54215085b7ba8303ad..e8f4fc03ffb01a0879e3b19ab303fc4b4dad5343 100644
--- a/dsa/locale/fr/fusiondirectory.po
+++ b/dsa/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/dsa/locale/hu_HU/fusiondirectory.po b/dsa/locale/hu_HU/fusiondirectory.po
index ac275877815d88f0419bfd793deb4c367a19b418..ceb8e8481b03812affe9201597bec822c0f9e904 100644
--- a/dsa/locale/hu_HU/fusiondirectory.po
+++ b/dsa/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/dsa/locale/id/fusiondirectory.po b/dsa/locale/id/fusiondirectory.po
index b58b90c47319f75ba39c70bb03d907a92e938adf..1b32c88e49fcdbf33b232b49450c666bba4fb895 100644
--- a/dsa/locale/id/fusiondirectory.po
+++ b/dsa/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dsa/locale/it_IT/fusiondirectory.po b/dsa/locale/it_IT/fusiondirectory.po
index a6ae08f57b15cde44d6d0f16cac3288f15663a38..f6fa8c995df80c422dfb11960997a6ab13bace31 100644
--- a/dsa/locale/it_IT/fusiondirectory.po
+++ b/dsa/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/dsa/locale/ja/fusiondirectory.po b/dsa/locale/ja/fusiondirectory.po
index 6fcd9954a38dc536b08fddb2817763e90154525b..6a2382c82cf3d51a0f51276e8c423db0e8305b7f 100644
--- a/dsa/locale/ja/fusiondirectory.po
+++ b/dsa/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dsa/locale/ko/fusiondirectory.po b/dsa/locale/ko/fusiondirectory.po
index 149757066a89e8859d0f583056f73d9b8577b4f8..348a318d2b07f7e45c75cd732d8b9bf34a481c1b 100644
--- a/dsa/locale/ko/fusiondirectory.po
+++ b/dsa/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/dsa/locale/lv/fusiondirectory.po b/dsa/locale/lv/fusiondirectory.po
index ead4f9d295839f32406b71d8aa22ff9a22da0158..1a7f38ef7366642b87b77a3447c4ebed263407ce 100644
--- a/dsa/locale/lv/fusiondirectory.po
+++ b/dsa/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/dsa/locale/nb/fusiondirectory.po b/dsa/locale/nb/fusiondirectory.po
index ffbfa9a064b5a4ce6c7e6d30115d2e6f69667545..77a0ed80654231b27389ab2e304ec5920ec351a0 100644
--- a/dsa/locale/nb/fusiondirectory.po
+++ b/dsa/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/dsa/locale/nl/fusiondirectory.po b/dsa/locale/nl/fusiondirectory.po
index 3281ba78728a74dae0682586c102b9e351f289c7..56cdf6a0e5d16cf9ef3aa06e29a714fd45457791 100644
--- a/dsa/locale/nl/fusiondirectory.po
+++ b/dsa/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Lucien Antonissen <lucien.antonissen@digipolis.be>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/dsa/locale/pl/fusiondirectory.po b/dsa/locale/pl/fusiondirectory.po
index 71e39fc35d506c9ef36e14eb7eebf76bda683197..51de70e9ab4a4cbe83e4923f1d0147527acdbae0 100644
--- a/dsa/locale/pl/fusiondirectory.po
+++ b/dsa/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dsa/locale/pt/fusiondirectory.po b/dsa/locale/pt/fusiondirectory.po
index ce50473958bb2efdd832df22fa6906633c2ba4a3..4957b9cfffb54065215438c698d3afd2323e8191 100644
--- a/dsa/locale/pt/fusiondirectory.po
+++ b/dsa/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/dsa/locale/pt_BR/fusiondirectory.po b/dsa/locale/pt_BR/fusiondirectory.po
index 5a0b4b536b951528d464d7bb983378f6bbf519cb..5b7fbf1a05fec748e3e0cefa3a2bfb3784084053 100644
--- a/dsa/locale/pt_BR/fusiondirectory.po
+++ b/dsa/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dsa/locale/ru/fusiondirectory.po b/dsa/locale/ru/fusiondirectory.po
index 172f2de5d6a33451f8ce5eb423bb05f8978dc17d..6b743a8dfa63313caf69d1c4fa701ab82a178969 100644
--- a/dsa/locale/ru/fusiondirectory.po
+++ b/dsa/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dsa/locale/ru@petr1708/fusiondirectory.po b/dsa/locale/ru@petr1708/fusiondirectory.po
index 892f9d84cdf0e197d2b6215f2b7fa5f1fa3de4c5..cfa44e75e6f964298102d285c50307b66e1cc4b1 100644
--- a/dsa/locale/ru@petr1708/fusiondirectory.po
+++ b/dsa/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dsa/locale/sv/fusiondirectory.po b/dsa/locale/sv/fusiondirectory.po
index e0d304378742308099ab29b62ea091b985bfdf21..655e7822a439596694f2e4f7e265873d63762f53 100644
--- a/dsa/locale/sv/fusiondirectory.po
+++ b/dsa/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dsa/locale/tr_TR/fusiondirectory.po b/dsa/locale/tr_TR/fusiondirectory.po
index b80271a42f6ca5ea1e582c630afdb4f4a51111ee..3ef58844cf38eb8a381fb737e74aa91d44a9abba 100644
--- a/dsa/locale/tr_TR/fusiondirectory.po
+++ b/dsa/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dsa/locale/ug/fusiondirectory.po b/dsa/locale/ug/fusiondirectory.po
index ac3f556e4c8d655820c01a57dc24f4b6ab0e6d94..757a770b1f92afde1bf58939032857307e6b1677 100644
--- a/dsa/locale/ug/fusiondirectory.po
+++ b/dsa/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/dsa/locale/vi_VN/fusiondirectory.po b/dsa/locale/vi_VN/fusiondirectory.po
index fec7ead01a30c04b7a9f4ed1ced8065e4021b1c9..e3cef12799ca53bb5e0358d0a26065ff2d24278d 100644
--- a/dsa/locale/vi_VN/fusiondirectory.po
+++ b/dsa/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/dsa/locale/zh/fusiondirectory.po b/dsa/locale/zh/fusiondirectory.po
index 0d8b6fa6b32ae6a5d02583d29e40ad0913bb5a22..73ef09b8f12fc17d38065a55bc69ad98cfa68d29 100644
--- a/dsa/locale/zh/fusiondirectory.po
+++ b/dsa/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/dsa/locale/zh_TW/fusiondirectory.po b/dsa/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..ebfb66f8304ab3b8aedfda3dfb7926f20ba3a9cb
--- /dev/null
+++ b/dsa/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,74 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/dsa/class_dsaManagement.inc:34 admin/dsa/class_dsaManagement.inc:39
+#: config/dsa/class_dsaConfig.inc:42
+msgid "DSA"
+msgstr ""
+
+#: admin/dsa/class_dsaManagement.inc:35
+msgid "DSA management"
+msgstr ""
+
+#: 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 ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:55
+msgid "Entry name"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:55
+msgid "Account name"
+msgstr ""
+
+#: 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:68
+msgid "Password"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:28
+msgid "DSA configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:29
+msgid "FusionDirectory dsa plugin configuration"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "DSA RDN"
+msgstr ""
+
+#: config/dsa/class_dsaConfig.inc:45
+msgid "Branch in which Directory Service Account (dsa) will be stored"
+msgstr ""
diff --git a/ejbca/locale/af_ZA/fusiondirectory.po b/ejbca/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..388d36abba05d6abd2379ea170be054728557740
--- /dev/null
+++ b/ejbca/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,86 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/ejbca/class_ejbcaManagement.inc:32
+#: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
+msgid "EJBCA"
+msgstr ""
+
+#: admin/ejbca/class_ejbcaManagement.inc:33
+msgid "EJBCA certificates management"
+msgstr ""
+
+#: admin/ejbca/class_ejbcaManagement.inc:52
+msgid "Download"
+msgstr ""
+
+#: admin/ejbca/certificates/class_ejbcaCertificates.inc:30
+msgid "Assign EJBCA certificates to a user"
+msgstr ""
+
+#: admin/ejbca/certificates/class_ejbcaCertificates.inc:48
+msgid "EJBCA certs"
+msgstr ""
+
+#: admin/ejbca/certificates/class_ejbcaCertificates.inc:52
+msgid "Certificates associated to this object"
+msgstr ""
+
+#: admin/ejbca/class_ejbcaCertificate.inc:30
+#: admin/ejbca/class_ejbcaCertificate.inc:31
+#: admin/ejbca/class_ejbcaCertificate.inc:33
+msgid "EJBCA certificate"
+msgstr ""
+
+#: admin/ejbca/class_ejbcaCertificate.inc:47
+#: admin/ejbca/class_ejbcaCertificate.inc:55
+msgid "Certificate"
+msgstr ""
+
+#: admin/ejbca/class_ejbcaCertificate.inc:51
+msgid "Name"
+msgstr ""
+
+#: admin/ejbca/class_ejbcaCertificate.inc:51
+msgid "Common name"
+msgstr ""
+
+#: admin/ejbca/class_ejbcaCertificate.inc:55
+msgid "Certificate content"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr ""
diff --git a/ejbca/locale/ar/fusiondirectory.po b/ejbca/locale/ar/fusiondirectory.po
index 5cf069decaef7448580d3ac4ae81c5eb7e8c60da..82faf04108a23ea8e18ed72fb2bb5d43ddbf5424 100644
--- a/ejbca/locale/ar/fusiondirectory.po
+++ b/ejbca/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/ejbca/locale/ca/fusiondirectory.po b/ejbca/locale/ca/fusiondirectory.po
index 33d20d5f0dfbc82c7b4339b7c8044ffaa16ece8e..6f83b3385b9fee7156de32fdd733ea4a0499b993 100644
--- a/ejbca/locale/ca/fusiondirectory.po
+++ b/ejbca/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/ejbca/locale/cs_CZ/fusiondirectory.po b/ejbca/locale/cs_CZ/fusiondirectory.po
index 2bde0a70970c206f553d171a15d85010507edda9..5804e27702e19cf80547bb07cbee0bfb99f1edd6 100644
--- a/ejbca/locale/cs_CZ/fusiondirectory.po
+++ b/ejbca/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/ejbca/class_ejbcaManagement.inc:32
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
diff --git a/ejbca/locale/de/fusiondirectory.po b/ejbca/locale/de/fusiondirectory.po
index 4b00c16697c96dfd87e2fc0d52f0835b4092c454..4948b0ff42b1421f682c238a7307e9311644f810 100644
--- a/ejbca/locale/de/fusiondirectory.po
+++ b/ejbca/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ejbca/locale/el_GR/fusiondirectory.po b/ejbca/locale/el_GR/fusiondirectory.po
index 85c062a6384a2e7e86604cb250d01ed73d13937a..db1668a969b9eed352186473b17d341d95965e30 100644
--- a/ejbca/locale/el_GR/fusiondirectory.po
+++ b/ejbca/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ejbca/locale/es/fusiondirectory.po b/ejbca/locale/es/fusiondirectory.po
index c7d85c3190ccf00d12095ade94db33d45c147654..47b57bbe8b3bf4bc6eb73ad4125e81903ea5965d 100644
--- a/ejbca/locale/es/fusiondirectory.po
+++ b/ejbca/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ejbca/locale/es_CO/fusiondirectory.po b/ejbca/locale/es_CO/fusiondirectory.po
index fbe0d7d40f0486baaa459c0f1505dfe06acffeea..b922caabd987e07cde172ec93459afa045b3cf1b 100644
--- a/ejbca/locale/es_CO/fusiondirectory.po
+++ b/ejbca/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ejbca/locale/es_VE/fusiondirectory.po b/ejbca/locale/es_VE/fusiondirectory.po
index 75d7415195aadbb35d478f81fe8d3f99f778f96d..0d8011b58f85f8b18f59726649ef57d9f6a8da53 100644
--- a/ejbca/locale/es_VE/fusiondirectory.po
+++ b/ejbca/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ejbca/locale/fa_IR/fusiondirectory.po b/ejbca/locale/fa_IR/fusiondirectory.po
index 56f866a82df0fa631a64a205dac32a0bc044129c..1d440e98c203f2805f3756dc40e313afd47dd18c 100644
--- a/ejbca/locale/fa_IR/fusiondirectory.po
+++ b/ejbca/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/ejbca/class_ejbcaManagement.inc:32
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
diff --git a/ejbca/locale/fi_FI/fusiondirectory.po b/ejbca/locale/fi_FI/fusiondirectory.po
index 8f6e9d9412acd639c1cc3b328486a8c32f53ed7f..0a5a15fa932eb04c6c24024e5f40c8ce34c68f35 100644
--- a/ejbca/locale/fi_FI/fusiondirectory.po
+++ b/ejbca/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/ejbca/locale/fr/fusiondirectory.po b/ejbca/locale/fr/fusiondirectory.po
index 535b86d2d042e2730eb458f64bd81b7437ee8274..a77709a304d78bdd4e51fe93bf29e110a9449bf6 100644
--- a/ejbca/locale/fr/fusiondirectory.po
+++ b/ejbca/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/ejbca/locale/hu_HU/fusiondirectory.po b/ejbca/locale/hu_HU/fusiondirectory.po
index 54bea173de053b4d88f780028fe709dcfb81fa0a..b8b8dd1a4de4a70a14d9afd0a1eff07387902456 100644
--- a/ejbca/locale/hu_HU/fusiondirectory.po
+++ b/ejbca/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/ejbca/locale/id/fusiondirectory.po b/ejbca/locale/id/fusiondirectory.po
index 8667da074a3eca30f0ca2301810d766ef8018331..91fe1aee3611bb67df102bda0c3efba9ccab191a 100644
--- a/ejbca/locale/id/fusiondirectory.po
+++ b/ejbca/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ejbca/locale/it_IT/fusiondirectory.po b/ejbca/locale/it_IT/fusiondirectory.po
index cb08fbea65454de973ef80464e2f7183d8350d0c..ad42b52460b93099f01695a5ff10b48e2c26944f 100644
--- a/ejbca/locale/it_IT/fusiondirectory.po
+++ b/ejbca/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/ejbca/locale/ja/fusiondirectory.po b/ejbca/locale/ja/fusiondirectory.po
index 1ce7aa9e4335883c102792e875e7afebcbfcf541..4c55d39ef672e9e496425a9f9068c78ebe017c6a 100644
--- a/ejbca/locale/ja/fusiondirectory.po
+++ b/ejbca/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ejbca/locale/ko/fusiondirectory.po b/ejbca/locale/ko/fusiondirectory.po
index 62af986a99cbddf10822b595ddefba9dac30ba02..8c6e1cb672749dd78f9734814008d6d49dad1f26 100644
--- a/ejbca/locale/ko/fusiondirectory.po
+++ b/ejbca/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/ejbca/locale/lv/fusiondirectory.po b/ejbca/locale/lv/fusiondirectory.po
index 7dbfc154228cdb8da31deb02aa5c53e2f5635120..318163bb5dc0229fa58764686695ff12e8438842 100644
--- a/ejbca/locale/lv/fusiondirectory.po
+++ b/ejbca/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/ejbca/locale/nb/fusiondirectory.po b/ejbca/locale/nb/fusiondirectory.po
index f7c21cdc8a3d4c60f0c2b6cd7cc5dcb32587ba90..f442a0a80a90eb8f8cc6e54feabf8ff37c5610d1 100644
--- a/ejbca/locale/nb/fusiondirectory.po
+++ b/ejbca/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/ejbca/locale/nl/fusiondirectory.po b/ejbca/locale/nl/fusiondirectory.po
index f6736c5479726295085fef4c9a59fbe53be4500d..bfb8ff4e0c05af9c3f2312f092a5275b4304420e 100644
--- a/ejbca/locale/nl/fusiondirectory.po
+++ b/ejbca/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/ejbca/locale/pl/fusiondirectory.po b/ejbca/locale/pl/fusiondirectory.po
index 545e2442e83a15560ab160d6196f4e5dc1a235c2..0b64e273a97e7796f645d9d4fb217704795813b1 100644
--- a/ejbca/locale/pl/fusiondirectory.po
+++ b/ejbca/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ejbca/locale/pt/fusiondirectory.po b/ejbca/locale/pt/fusiondirectory.po
index 1339c82c9b5c57d124e019d1ed8c57d5e53f2c99..427f1bddd874271e053a33cd69b5408134d0e5c8 100644
--- a/ejbca/locale/pt/fusiondirectory.po
+++ b/ejbca/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/ejbca/locale/pt_BR/fusiondirectory.po b/ejbca/locale/pt_BR/fusiondirectory.po
index 012d377accb4bc41620519254adc761e836abbb5..8c6418898e1707fcb62f89a4a8c1eb9b93e5c08c 100644
--- a/ejbca/locale/pt_BR/fusiondirectory.po
+++ b/ejbca/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ejbca/locale/ru/fusiondirectory.po b/ejbca/locale/ru/fusiondirectory.po
index a35dad3bb6b73c6a802af0c9d3b4ae718aa1757b..6fbbd535476fa24cb591a2afa0db9db2f239e930 100644
--- a/ejbca/locale/ru/fusiondirectory.po
+++ b/ejbca/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ejbca/locale/ru@petr1708/fusiondirectory.po b/ejbca/locale/ru@petr1708/fusiondirectory.po
index 77d91892e7d497145758ce02f3ffece3564bae93..a413774b1cc300b178d96d2ecaf2ecfea04c27ef 100644
--- a/ejbca/locale/ru@petr1708/fusiondirectory.po
+++ b/ejbca/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ejbca/locale/sv/fusiondirectory.po b/ejbca/locale/sv/fusiondirectory.po
index 7c3f3102599a7df2bcc176d3a4b755b14324d5a3..e8b82a942e9d8afc9a4c15e04397b8a70240a5a4 100644
--- a/ejbca/locale/sv/fusiondirectory.po
+++ b/ejbca/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ejbca/locale/tr_TR/fusiondirectory.po b/ejbca/locale/tr_TR/fusiondirectory.po
index 12f5c7ff10464ecd573a88e4bd5f4151056388d9..e11754944497b7a83d3f4891f8628aa384b635fa 100644
--- a/ejbca/locale/tr_TR/fusiondirectory.po
+++ b/ejbca/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ejbca/locale/ug/fusiondirectory.po b/ejbca/locale/ug/fusiondirectory.po
index a5d587512fa8c2d7a46aa4b3aa632e44b55619a1..8c95b4ee07cb3e8a208f48cdb1afc653e6934c30 100644
--- a/ejbca/locale/ug/fusiondirectory.po
+++ b/ejbca/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ejbca/locale/vi_VN/fusiondirectory.po b/ejbca/locale/vi_VN/fusiondirectory.po
index f23a1d636f1074522c25b3db41dc68fb21eee24c..98b3d75515e68f80d062a4161ec2c6a8ac7b7ae5 100644
--- a/ejbca/locale/vi_VN/fusiondirectory.po
+++ b/ejbca/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/ejbca/locale/zh/fusiondirectory.po b/ejbca/locale/zh/fusiondirectory.po
index c2a1c2605cfac769492bd40a8bf5c31eea8e379d..2b4746cf4dee9299e52c9f70ae3421c48b1aa04d 100644
--- a/ejbca/locale/zh/fusiondirectory.po
+++ b/ejbca/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ejbca/locale/zh_TW/fusiondirectory.po b/ejbca/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..f7415b65d662ca7a76a2db68e511f335bfd28611
--- /dev/null
+++ b/ejbca/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,86 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/ejbca/class_ejbcaManagement.inc:32
+#: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
+msgid "EJBCA"
+msgstr ""
+
+#: admin/ejbca/class_ejbcaManagement.inc:33
+msgid "EJBCA certificates management"
+msgstr ""
+
+#: admin/ejbca/class_ejbcaManagement.inc:52
+msgid "Download"
+msgstr ""
+
+#: admin/ejbca/certificates/class_ejbcaCertificates.inc:30
+msgid "Assign EJBCA certificates to a user"
+msgstr ""
+
+#: admin/ejbca/certificates/class_ejbcaCertificates.inc:48
+msgid "EJBCA certs"
+msgstr ""
+
+#: admin/ejbca/certificates/class_ejbcaCertificates.inc:52
+msgid "Certificates associated to this object"
+msgstr ""
+
+#: admin/ejbca/class_ejbcaCertificate.inc:30
+#: admin/ejbca/class_ejbcaCertificate.inc:31
+#: admin/ejbca/class_ejbcaCertificate.inc:33
+msgid "EJBCA certificate"
+msgstr ""
+
+#: admin/ejbca/class_ejbcaCertificate.inc:47
+#: admin/ejbca/class_ejbcaCertificate.inc:55
+msgid "Certificate"
+msgstr ""
+
+#: admin/ejbca/class_ejbcaCertificate.inc:51
+msgid "Name"
+msgstr ""
+
+#: admin/ejbca/class_ejbcaCertificate.inc:51
+msgid "Common name"
+msgstr ""
+
+#: admin/ejbca/class_ejbcaCertificate.inc:55
+msgid "Certificate content"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:28
+msgid "EJBCA plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:29
+msgid "FusionDirectory ejbca plugin configuration"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:42
+msgid "EJBCA plugin"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "EJBCA RDN"
+msgstr ""
+
+#: config/ejbca/class_ejbcaConfig.inc:45
+msgid "Branch in which ejbca certificates are stored"
+msgstr ""
diff --git a/fai/admin/fai/class_faiDiskEntry.inc b/fai/admin/fai/class_faiDiskEntry.inc
index b6c2f3a315ae60b352c2ff8440e60878a498895e..34517664943c5c92eb68951f36f14e016c66601e 100644
--- a/fai/admin/fai/class_faiDiskEntry.inc
+++ b/fai/admin/fai/class_faiDiskEntry.inc
@@ -97,9 +97,6 @@ class DiskPartitionsAttribute extends DialogOrderedArrayAttribute
   protected function getAttributeArrayValue($key, $value)
   {
     $opt = array();
-    if (isset($value['encrypted']) && $value['encrypted']) {
-      $opt[] = _('encrypted');
-    }
     if (isset($value['bootable']) && $value['bootable']) {
       $opt[] = _('bootable');
     }
@@ -119,7 +116,7 @@ class DiskPartitionsAttribute extends DialogOrderedArrayAttribute
   function delPostValue ($key)
   {
     /* Create a list of all partitions that are used in
-     *  lvm or raid compilations.
+     *  lvm, raid or cryptsetup compilations.
      */
     $list = array();
     foreach ($this->plugin->parent->disks as $disk) {
@@ -133,6 +130,10 @@ class DiskPartitionsAttribute extends DialogOrderedArrayAttribute
             $list[preg_replace('/:.*$/', '', $partname)][] = $disk;
           }
         }
+      } elseif ($disk['FAIdiskType'] == 'cryptsetup') {
+        foreach ($disk['partitions'] as $part) {
+          $list[$part['FAIpartitionSize']][] = $disk;
+        }
       }
     }
 
@@ -167,7 +168,11 @@ class DiskPartitionsAttribute extends DialogOrderedArrayAttribute
     }
 
     if ($this->plugin->FAIdiskType == 'disk') {
-      $part['cn'] = $this->plugin->cn.$part['FAIpartitionNr'];
+      if (preg_match('/^disk(\d+)$/', $this->plugin->cn)) {
+        $part['cn'] = $this->plugin->cn.'.'.$part['FAIpartitionNr'];
+      } else {
+        $part['cn'] = $this->plugin->cn.$part['FAIpartitionNr'];
+      }
     } elseif ($this->plugin->FAIdiskType == 'lvm') {
       /* Check if we need to update partition names of lvm compilations */
       if (isset($this->value[$part['FAIpartitionNr']])) {
@@ -183,6 +188,9 @@ class DiskPartitionsAttribute extends DialogOrderedArrayAttribute
     } elseif ($this->plugin->FAIdiskType == 'raid') {
       /* Set raid names to md# */
       $part['cn'] = 'md'.$part['FAIpartitionNr'];
+    } elseif ($this->plugin->FAIdiskType == 'cryptsetup') {
+      /* Set cryptsetup names to luks# */
+      $part['cn'] = 'luks'.$part['FAIpartitionNr'];
     }
 
     $this->value[$part['FAIpartitionNr']] = $part;
@@ -251,6 +259,10 @@ class faiDiskEntry extends simplePlugin
             array('msdos', 'gpt'), '',
             array('MSDOS', 'GPT')
           ),
+          new BooleanAttribute (
+            _('Random init'), _('Initialise all encrypted partitions with random data'),
+            'randinit', FALSE
+          ),
           new HiddenAttribute ('FAIdiskType')
         )
       ),
@@ -277,21 +289,37 @@ class faiDiskEntry extends simplePlugin
   {
     parent::__construct($dn, NULL, $parent);
 
-    $this->FAIdiskType  = $type;
-    if ($this->FAIdiskType != 'lvm') {
-      $this->attributesAccess['lvmDevices']->setDisabled(TRUE);
-      $this->attributesAccess['lvmDevices']->setVisible(FALSE);
-    }
-
     if ($disk) {
       $this->is_edit     = TRUE;
 
       $this->cn          = $disk['cn'];
       $this->description = $disk['description'];
       $this->attributesAccess['cn']->setInitialValue($this->cn);
+    }
 
-      /* Get devices used in volume base disks */
+    $this->FAIdiskType  = $type;
+    if ($this->FAIdiskType == 'lvm') {
       $this->attributesAccess['lvmDevices']->attribute->setChoices($this->getAvailablePartitions());
+    } else {
+      $this->attributesAccess['lvmDevices']->setDisabled(TRUE);
+      $this->attributesAccess['lvmDevices']->setVisible(FALSE);
+    }
+    if ($this->FAIdiskType != 'disk') {
+      $this->attributesAccess['disklabel']->setDisabled(TRUE);
+      $this->attributesAccess['disklabel']->setVisible(FALSE);
+      $this->attributesAccess['cn']->setDisabled(TRUE);
+      $this->attributesAccess['cn']->setValue($this->FAIdiskType);
+    }
+    if ($this->FAIdiskType == 'cryptsetup') {
+      $this->attributesAccess['fstabkey']->setDisabled(TRUE);
+      $this->attributesAccess['fstabkey']->setVisible(FALSE);
+    } else {
+      $this->attributesAccess['randinit']->setDisabled(TRUE);
+      $this->attributesAccess['randinit']->setVisible(FALSE);
+    }
+
+    if ($disk) {
+      /* Get devices used in volume base disks */
       if (isset($disk['FAIlvmDevice'])) {
         $this->lvmDevices = $disk['FAIlvmDevice'];
       }
@@ -348,6 +376,11 @@ class faiDiskEntry extends simplePlugin
             }
             continue;
           }
+
+          if ($option == 'randinit') {
+            $this->randinit = TRUE;
+            continue;
+          }
         }
       }
 
@@ -396,7 +429,11 @@ class faiDiskEntry extends simplePlugin
     foreach ($partitions as $key => $val) {
       $partitions[$key]['FAIpartitionNr'] = $key;
       if ($this->FAIdiskType == 'disk') {
-        $partitions[$key]['cn'] = $this->cn.$key;
+        if (preg_match('/^disk(\d+)$/', $this->cn)) {
+          $partitions[$key]['cn'] = $this->cn.'.'.$key;
+        } else {
+          $partitions[$key]['cn'] = $this->cn.$key;
+        }
       } elseif ($this->FAIdiskType == 'lvm') {
         $partitions[$key]['FAIpartitionType'] = 'lvm';
       }
@@ -411,6 +448,12 @@ class faiDiskEntry extends simplePlugin
     /* Assemble flags */
     if ($this->FAIdiskType == 'disk') {
       $tmp['FAIdiskOption'] = array('fstabkey:'.$this->fstabkey, 'disklabel:'.$this->disklabel);
+    } elseif ($this->FAIdiskType == 'cryptsetup') {
+      if ($this->randinit) {
+        $tmp['FAIdiskOption'] = array('randinit');
+      } else {
+        $tmp['FAIdiskOption'] = array();
+      }
     } else {
       $tmp['FAIdiskOption'] = array('fstabkey:'.$this->fstabkey);
     }
@@ -444,14 +487,14 @@ class faiDiskEntry extends simplePlugin
       }
 
       /* Unset non valid attributes */
-      foreach (array('bootable','encrypted','preserve','resize','FAIdiskType') as $attr) {
+      foreach (array('bootable','preserve','resize','FAIdiskType') as $attr) {
         if (isset($tmp['partitions'][$id][$attr])) {
           unset($tmp['partitions'][$id][$attr]);
         }
       }
     }
 
-    /* Assembe disk flags */
+    /* Assemble disk flags */
     if (!empty($bootable)) {
       $tmp['FAIdiskOption'][] = 'bootable:'.trim($bootable, ',');
     }
@@ -493,10 +536,8 @@ class faiDiskEntry extends simplePlugin
           foreach (explode(',', $part['FAIpartitionSize']) as $rDevice) {
             $used[] = preg_replace('/:.*$/i', '', $rDevice);
           }
-        }
-
-        // Collect all available disks
-        if ($disk['FAIdiskType'] == 'disk') {
+        } elseif ($disk['FAIdiskType'] == 'disk') {
+          // Collect all available disks
           $name = $part['cn'];
           if (!in_array($name, $this->lvmDevices)) {
             $may[] = $name;
diff --git a/fai/admin/fai/class_faiHook.inc b/fai/admin/fai/class_faiHook.inc
index db6022552c7dce17aa769cb342f71c1886574b55..a64c19cb6b19500eefe48d10e59239dadbeec0b2 100644
--- a/fai/admin/fai/class_faiHook.inc
+++ b/fai/admin/fai/class_faiHook.inc
@@ -74,7 +74,7 @@ class faiHook extends faiSimplePluginClass
                 'description', FALSE
               ),
               new SelectAttribute (
-                _('Task'), _(''),
+                _('Task'), _('Task to run'),
                 'FAItask', TRUE,
                 array('chboot','configure','debconf','error','extrbase',
                        'faiend','finish','install','instsoft','mirror',
diff --git a/fai/admin/fai/class_faiPartition.inc b/fai/admin/fai/class_faiPartition.inc
index 1e5c73a8dd2e9873a9ff734da3c62ec5e66cd824..e6b36bd16eb0d2e3133971d3631c1ecf156c5ce2 100644
--- a/fai/admin/fai/class_faiPartition.inc
+++ b/fai/admin/fai/class_faiPartition.inc
@@ -266,13 +266,13 @@ class faiPartition extends simplePlugin
                     'raidDevices_select', FALSE
                   ),
                   new BooleanAttribute(
-                    _('Spare'), _(''),
+                    _('Spare'), _('Spare Raid device'),
                     'raidDevices_spare', FALSE,
                     FALSE, '',
                     ':spare', ''
                   ),
                   new BooleanAttribute(
-                    _('Missing'), _(''),
+                    _('Missing'), _('Missing Raid device'),
                     'raidDevices_missing', FALSE,
                     FALSE, '',
                     ':missing', ''
@@ -288,6 +288,14 @@ class faiPartition extends simplePlugin
               TRUE
             )
           ),
+          new SelectAttribute(
+            _('Partition'), _('Partition to encrypt'),
+            'cryptsetupPartition', FALSE
+          ),
+          new StringAttribute(
+            _('Password'), _('Password to use for encryption. Leave empty to use a encryption key file instead.'),
+            'cryptsetupPassword', FALSE
+          ),
           new BooleanAttribute (
             _('Resize'), _('Resize existing partition'),
             'resize', FALSE
@@ -297,7 +305,7 @@ class faiPartition extends simplePlugin
             'bootable', FALSE
           ),
           new SelectAttribute (
-            _('Preserve'), _(''),
+            _('Preserve'), _('Does the partition need to be preserved'),
             'preserve', FALSE,
             array('','always','reinstall'), '',
             array(_('Never'),_('Always'),_('Reinstall'))
@@ -311,11 +319,7 @@ class faiPartition extends simplePlugin
             _('Filesystem'), _('The filesystem this partition should be formatted with'),
             'FAIfsType', TRUE,
             array('swap','ext2','ext3','ext4','reiserfs','xfs','btrfs','-'), 'ext4',
-            array(_('swap space'),_('ext2'),_('ext3'),_('ext4'),_('reiser fs'),_('xfs'),_('btrfs'),_('LVM/RAID'))
-          ),
-          new BooleanAttribute (
-            _('Encrypted'), _('Wether or not this partition is encrypted'),
-            'encrypted', FALSE
+            array(_('swap'),_('ext2'),_('ext3'),_('ext4'),_('reiser fs'),_('xfs'),_('btrfs'),_('LVM/RAID'))
           ),
           new FaiMountPointAttribute (
             _('Mount point'), _('Mount point for this partition'),
@@ -326,6 +330,11 @@ class faiPartition extends simplePlugin
       'options' => array(
         'name'  => _('Options'),
         'attrs' => array(
+          new StringAttribute (
+            _('Mount options'), _('Filesystem mount options'),
+            'FAImountOptions', FALSE,
+            'defaults'
+          ),
           new StringAttribute (
             _('Create options'), _('Filesystem create options'),
             'FAIfsCreateOptions', FALSE
@@ -334,10 +343,6 @@ class faiPartition extends simplePlugin
             _('Tune options'), _('Filesystem tune options'),
             'FAIfsTuneOptions', FALSE
           ),
-          new StringAttribute (
-            _('Mount options'), _('Filesystem mount options'),
-            'FAIfsOptions', FALSE
-          ),
         )
       )
     );
@@ -382,6 +387,12 @@ class faiPartition extends simplePlugin
         'raid5' => _('RAID 5'),
         'raid6' => _('RAID 6')
       );
+    } elseif ($this->FAIdiskType == 'cryptsetup') {
+      $types  = array(
+        'luks'  => _('LUKS'),
+        'swap'  => _('Swap'),
+        'tmp'   => _('tmp'),
+      );
     } else {
       $types = array();
     }
@@ -396,25 +407,44 @@ class faiPartition extends simplePlugin
       if ($type == 'raid') {
         $object['raidDevices'] = $object['FAIpartitionSize'];
         unset($object['FAIpartitionSize']);
+      } elseif ($type == 'cryptsetup') {
+        $object['cryptsetupPartition'] = $object['FAIpartitionSize'];
+        unset($object['FAIpartitionSize']);
+        if (preg_match('/^luks:"(.+)"$/', $object['FAIpartitionType'], $m)) {
+          $object['FAIpartitionType']   = 'luks';
+          $object['cryptsetupPassword'] = $m[1];
+        }
       }
       foreach ($this->attributes as $attr) {
         if (isset($object[$attr])) {
           $this->$attr = $object[$attr];
         }
       }
-
-      if (($this->FAIdiskType == 'disk') || ($this->FAIdiskType == 'lvm')) {
-        /* Check for encrypted partitions */
-        if (preg_match('/:encrypt$/', $this->FAImountPoint)) {
-          $this->FAImountPoint = preg_replace('/:encrypt/', '', $this->FAImountPoint);
-          $this->encrypted = TRUE;
-        }
-      }
     }
 
     if ($this->FAIdiskType != 'lvm') {
       $this->attributesAccess['cn']->setDisabled(TRUE);
     }
+
+    if ($this->FAIdiskType == 'cryptsetup') {
+      $this->attributesAccess['cryptsetupPartition']->setChoices($this->getPartitionList());
+      $this->attributesAccess['cryptsetupPartition']->setRequired(TRUE);
+      $this->attributesAccess['FAIpartitionSize']->setDisabled(TRUE);
+      $this->attributesAccess['FAIpartitionSize']->setVisible(FALSE);
+      $this->attributesInfo['flags']['name'] = _('Encryption settings');
+      $this->attributesAccess['resize']->setDisabled(TRUE);
+      $this->attributesAccess['resize']->setVisible(FALSE);
+      $this->attributesAccess['preserve']->setDisabled(TRUE);
+      $this->attributesAccess['preserve']->setVisible(FALSE);
+      $this->attributesAccess['bootable']->setDisabled(TRUE);
+      $this->attributesAccess['bootable']->setVisible(FALSE);
+    } else {
+      $this->attributesAccess['cryptsetupPartition']->setDisabled(TRUE);
+      $this->attributesAccess['cryptsetupPartition']->setVisible(FALSE);
+      $this->attributesAccess['cryptsetupPassword']->setDisabled(TRUE);
+      $this->attributesAccess['cryptsetupPassword']->setVisible(FALSE);
+    }
+
     if ($this->FAIdiskType == 'raid') {
       $this->attributesAccess['raidDevices']->attributes[0]->attribute->attributes[0]->setChoices($this->getPartitionList());
       $this->attributesAccess['FAIpartitionSize']->setDisabled(TRUE);
@@ -491,14 +521,16 @@ class faiPartition extends simplePlugin
       $ret[$attr] = $this->$attr;
     }
 
-    if (($this->FAIdiskType == 'disk') || ($this->FAIdiskType == 'lvm')) {
-      /* Add encryption flag to partition mount point */
-      if ($this->encrypted) {
-        $ret['FAImountPoint'] .= ':encrypt';
-      }
-    } elseif($this->FAIdiskType == 'raid') {
+    if ($this->FAIdiskType == 'raid') {
       $ret['FAIpartitionSize'] = $ret['raidDevices'];
       unset($ret['raidDevices']);
+    } elseif ($this->FAIdiskType == 'cryptsetup') {
+      $ret['FAIpartitionSize'] = $ret['cryptsetupPartition'];
+      unset($ret['cryptsetupPartition']);
+      if (!empty($ret['cryptsetupPassword'])) {
+        $ret['FAIpartitionType'] .= ':"'.$ret['cryptsetupPassword'].'"';
+      }
+      unset($ret['cryptsetupPassword']);
     }
 
     return $ret;
@@ -531,10 +563,7 @@ class faiPartition extends simplePlugin
 
         // Collect all available disks
         if ($disk['FAIdiskType'] == 'disk') {
-          $name = $part['cn'];
-          if (!isset($this->raidDevices[$name])) {
-            $may[] = $name;
-          }
+          $may[] = $part['cn'];
         }
       }
     }
diff --git a/fai/admin/fai/class_faiPartitionTable.inc b/fai/admin/fai/class_faiPartitionTable.inc
index 80f37489a9dfe5a4c646e574c8d3e586dd7c2fee..09d628b0b6a3144123a3aa5ea51ebf99c8452e16 100644
--- a/fai/admin/fai/class_faiPartitionTable.inc
+++ b/fai/admin/fai/class_faiPartitionTable.inc
@@ -80,10 +80,11 @@ class PartitionTableAttribute extends DialogOrderedArrayAttribute
   protected $dialogClass = 'DiskEntryDialog';
   protected $partitionAttributes  = array(
     'cn','description',
-    'FAIpartitionNr',   'FAIpartitionSize',   'FAImountPoint',
-    'FAIfsType',        'FAIpartitionType',   'FAImountOptions',
-    'FAIfsOptions',     'FAIpartitionFlags',  'FAIfsCreateOptions',
-    'FAIfsTuneOptions', 'FAIfsOptions',       'FAIpartitionFlags',
+    'FAIpartitionNr',     'FAIpartitionSize',
+    'FAIpartitionType',   'FAIpartitionFlags',
+    'FAImountPoint',      'FAImountOptions',
+    'FAIfsType',
+    'FAIfsCreateOptions', 'FAIfsTuneOptions',
     'FAIlvmDevice'
   );
 
@@ -101,19 +102,37 @@ class PartitionTableAttribute extends DialogOrderedArrayAttribute
   function renderButtons ()
   {
     $id = $this->getHtmlId();
-    return $this->renderInputField(
+    $buttons = $this->renderInputField(
       'submit',
       'add'.$id.'_dialog',
-      array('value' => '{msgPool type=addButton}')
-    ).$this->renderInputField(
-      'submit',
-      'add'.$id.'_dialog_raid',
-      array('value' => _('Add RAID'))
-    ).$this->renderInputField(
-      'submit',
-      'add'.$id.'_dialog_lvm',
-      array('value' => _('Add LVM'))
+      array('value' => _('Add disk'))
     );
+
+    if (!isset($this->value['raid'])) {
+      $buttons .= $this->renderInputField(
+        'submit',
+        'add'.$id.'_dialog_raid',
+        array('value' => _('Add RAID'))
+      );
+    }
+
+    if (!isset($this->value['lvm'])) {
+      $buttons .= $this->renderInputField(
+        'submit',
+        'add'.$id.'_dialog_lvm',
+        array('value' => _('Add LVM'))
+      );
+    }
+
+    if (!isset($this->value['cryptsetup'])) {
+      $buttons .= $this->renderInputField(
+        'submit',
+        'add'.$id.'_dialog_cryptsetup',
+        array('value' => _('Add cryptsetup'))
+      );
+    }
+
+    return $buttons;
   }
 
   function loadPostValue ()
@@ -128,6 +147,8 @@ class PartitionTableAttribute extends DialogOrderedArrayAttribute
         $this->plugin->openDialog(new $this->dialogClass($this->plugin, $this, array(), 'raid'));
       } elseif (isset($_POST['add'.$id.'_dialog_lvm'])) {
         $this->plugin->openDialog(new $this->dialogClass($this->plugin, $this, array(), 'lvm'));
+      } elseif (isset($_POST['add'.$id.'_dialog_cryptsetup'])) {
+        $this->plugin->openDialog(new $this->dialogClass($this->plugin, $this, array(), 'cryptsetup'));
       }
     }
   }
@@ -151,6 +172,9 @@ class PartitionTableAttribute extends DialogOrderedArrayAttribute
             $diskInfos[$attr] = $subattrs[$attr][0];
           }
         }
+        if ($diskInfos['FAIdiskType'] != 'disk') {
+          $diskInfos['cn'] = $diskInfos['FAIdiskType'];
+        }
 
         // Get disk options, without 'count' index.
         $diskInfos['FAIdiskOption'] = array();
@@ -168,9 +192,9 @@ class PartitionTableAttribute extends DialogOrderedArrayAttribute
           }
         }
 
-        $diskInfos['dn'] = $subattrs['dn'];
-        $this->value[$diskInfos['dn']] = $diskInfos;
-        $this->value[$diskInfos['dn']]['partitions'] = array();
+        $diskInfos['dn']                              = $subattrs['dn'];
+        $this->value[$diskInfos['cn']]                = $diskInfos;
+        $this->value[$diskInfos['cn']]['partitions']  = array();
       }
       /* Fetch partitions */
       foreach ($this->value as $name => $disk) {
@@ -270,8 +294,6 @@ class PartitionTableAttribute extends DialogOrderedArrayAttribute
   function diskConfigured ($disk)
   {
     if (isset($disk['rename'])) {
-      unset($this->value[$disk['rename']['from']]);
-      $disk['cn'] = $disk['rename']['to'];
       unset($disk['rename']);
     }
 
diff --git a/fai/contrib/openldap/fai.schema b/fai/contrib/openldap/fai.schema
index 33554157a7167970160988cf74daa0936eaae65a..5fd0b2b4a335c152c24c1e6a5dcb1139dca05b02 100644
--- a/fai/contrib/openldap/fai.schema
+++ b/fai/contrib/openldap/fai.schema
@@ -313,21 +313,21 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.5.30 NAME 'FAIpartitionMethod'
 # Name       : FAIdiskOption
 # Description: Store new disk options like preserve_always, etc.
 attributetype ( 1.3.6.1.4.1.10098.1.1.5.31 NAME 'FAIdiskOption'
-    DESC 'Options for the disk creation'
+    DESC 'Options for the disk like preserve_always, etc.'
                 EQUALITY caseIgnoreIA5Match
                 SUBSTR caseIgnoreIA5SubstringsMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
 
 # Name       : FAIdiskType
-# Description: Differenciate between lvm, raid and disk
+# Description: Differenciate between lvm, raid, cryptsetup and disk
 attributetype ( 1.3.6.1.4.1.10098.1.1.5.32 NAME 'FAIdiskType'
-    DESC 'Options for the disk creation'
+    DESC 'disk_config type. May be lvm, raid, cryptsetup or disk.'
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE)
 
 # Name       : FAIlvmDevice
 # Description: For lvm disk definitions, store the physical devices
 attributetype ( 1.3.6.1.4.1.10098.1.1.5.33 NAME 'FAIlvmDevice'
-    DESC 'Options for the disk creation'
+    DESC 'For lvm disk definitions, store the physical devices'
                 EQUALITY caseIgnoreIA5Match
                 SUBSTR caseIgnoreIA5SubstringsMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
@@ -335,13 +335,13 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.5.33 NAME 'FAIlvmDevice'
 # Name       : FAIfsCreateOptions
 # Description: New option field to pass FS creation options
 attributetype ( 1.3.6.1.4.1.10098.1.1.5.34 NAME 'FAIfsCreateOptions'
-    DESC 'Options for the disk creation'
+    DESC 'Option field to pass FS creation options'
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
 
 # Name       : FAIfsTuneOptions
 # Description: New option field to pass FS tuning options
 attributetype ( 1.3.6.1.4.1.10098.1.1.5.35 NAME 'FAIfsTuneOptions'
-    DESC 'Options for the disk creation'
+    DESC 'Option field to pass FS tuning options'
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
 
 ##
diff --git a/fai/locale/af_ZA/fusiondirectory.po b/fai/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..80da25c7762d0606a3ab6cf96157c0674530b583
--- /dev/null
+++ b/fai/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,1021 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/fai/class_faiVariable.inc:28
+msgid "Variable"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:29 admin/fai/class_faiVariable.inc:32
+msgid "FAI variable"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:48 admin/fai/class_faiScript.inc:50
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
+#: admin/fai/class_faiTemplateEntry.inc:139
+#: admin/fai/class_faiPartitionTable.inc:331
+msgid "Properties"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
+#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
+#: admin/fai/class_faiPartitionTable.inc:334
+msgid "Class name"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+msgid "Variables class name"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
+#: admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiTemplateEntry.inc:146
+#: admin/fai/class_faiPartitionTable.inc:338
+msgid "Description"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+#: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiPartitionTable.inc:338
+msgid "Short description of the class"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:61
+msgid "Variables"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:65 admin/fai/class_faiScript.inc:67
+#: admin/fai/class_faiHook.inc:65
+msgid "Variables in this class"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiDiskEntry.inc:241
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
+#: admin/fai/class_faiHook.inc:69
+msgid "Name"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:69 admin/fai/class_faiScript.inc:71
+#: admin/fai/class_faiHook.inc:69
+msgid "The name of the variable"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:73 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiHook.inc:73
+msgid "A short description of the variable"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:77
+msgid "Content"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:77
+msgid "The content of the variable"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:101
+msgid "bootable"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:104
+msgid "preserve"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239
+msgid "Error"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:147
+#, php-format
+msgid ""
+"The partition cannot be deleted while it is used in the \"%s\" disk "
+"definition!"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:226
+msgid "Partition table entry"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:227
+msgid "FAI partition table entry"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
+msgid "Device"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:241
+msgid "Disk name"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
+msgid "Short description"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:251
+msgid "fstab key"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:251
+msgid "Key to use in fstab file"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:254
+msgid "Label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:254
+msgid "UUID"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:257
+msgid "Disk label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
+msgid "Partition entries"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
+msgid "Combined physical partitions"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:275
+msgid "Physical partitions combined in this LVM volume"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
+msgid "Partitions in this class"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:579
+msgid ""
+"You have more than four primary partition table entries in your "
+"configuration"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:583
+msgid ""
+"You cannot have more than three primary partition while using logical "
+"partitions"
+msgstr ""
+
+#: admin/fai/packageSelect/selectPackage-list.xml:11
+msgid "Please select the desired entries"
+msgstr ""
+
+#: admin/fai/packageSelect/selectPackage-list.xml:15
+#: admin/fai/class_faiPackage.inc:376
+msgid "Package"
+msgstr ""
+
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
+msgstr ""
+
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+#: admin/fai/class_faiPackageConfiguration.inc:59
+#: admin/fai/class_faiPackage.inc:287
+msgid "Infrastructure service"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:30
+msgid "Type of sizing - fixed, dynamic or all remaining space"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:33
+msgid "Fixed"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:33
+msgid "Dynamic"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:33
+msgid "Remaining space"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:44 admin/fai/class_faiPartition.inc:55
+msgid "KB"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:44 admin/fai/class_faiPartition.inc:55
+msgid "MB"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:44 admin/fai/class_faiPartition.inc:55
+msgid "GB"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:44 admin/fai/class_faiPartition.inc:55
+msgid "TB"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:44 admin/fai/class_faiPartition.inc:55
+msgid "PB"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:144
+msgid "Minimum partition size"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:144
+msgid "Maximum partition size"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:217
+msgid "Partition entry"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:218
+msgid "FAI partition entry"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
+msgid "Partition"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:234
+msgid "Type"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:234
+msgid "Partition type"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
+msgid "Primary"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
+msgid "Logical"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:240
+msgid "Partition name"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:250
+msgid "Size"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:250
+msgid "Size of this partition"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:256
+msgid "Flags"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:265
+msgid "Combined physical partitions in this RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
+msgid "Resize"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
+msgid "Resize existing partition"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:304
+msgid "Bootable"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:304
+msgid "Wether or not this partition can be booted"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:308
+msgid "Preserve"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
+msgid "Never"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
+msgid "Always"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
+msgid "Reinstall"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
+msgid "Filesystem"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:319
+msgid "The filesystem this partition should be formatted with"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:322
+msgid "ext2"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:322
+msgid "ext3"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:322
+msgid "ext4"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:322
+msgid "reiser fs"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:322
+msgid "xfs"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:322
+msgid "btrfs"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:322
+msgid "LVM/RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point for this partition"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:331
+msgid "Options"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:339
+msgid "Create options"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:339
+msgid "Filesystem create options"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:343
+msgid "Tune options"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:343
+msgid "Filesystem tune options"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:385
+msgid "RAID 0"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:386
+msgid "RAID 1"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:387
+msgid "RAID 5"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:388
+msgid "RAID 6"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
+msgid "Raid arrays must contain at least two partitions!"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:510
+msgid ""
+"Raid 0 arrays can only be realized with a combination of two partitions!"
+msgstr ""
+
+#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
+#: admin/fai/class_faiHook.inc:85
+msgid "Script"
+msgstr ""
+
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
+msgstr ""
+
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
+msgstr ""
+
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
+msgstr ""
+
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (smaller is done first)"
+msgstr ""
+
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
+msgstr ""
+
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
+msgstr ""
+
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
+msgstr ""
+
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
+msgstr ""
+
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
+msgstr ""
+
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:33
+#: admin/fai/class_faiPackageConfiguration.inc:36
+msgid "FAI package configuration"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:34
+msgid "Configure debconf options of a package"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:80
+#, php-format
+msgid "Debconf information for package \"%s\""
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:172
+msgid "Warning"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:173
+#, php-format
+msgid ""
+"The debconf questions \"%s\" are dynamically generated during package "
+"installation and requires choosing between specific options which cannot be "
+"presented here. The entered text needs to be one of the valid choices in "
+"order to take effect."
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:163
+msgid "Mark for installation"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:167
+msgid "Mark for removal"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:172
+msgid "Edit configuration"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
+#: admin/systems/services/repository/class_serviceRepository.inc:240
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+msgid "LDAP error"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:306
+msgid "Unkown packages"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:377
+msgid "FAI Package list"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:380
+msgid "FAI Package"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:103
+msgid "Repository"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:91
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+msgid "Release"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:412
+msgid "Debian release concerned"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:416
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+msgid "Sections"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections concerned"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:420
+msgid "Install method"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:420
+msgid "Install method to use for this package list"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:431
+msgid "Packages"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:435
+msgid "Packages in this class"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:131
+#, php-format
+msgid "There are several files with the same path: %s"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:146
+msgid "Template"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
+msgid "FAI template"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:169
+msgid "Template class name"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:179
+msgid "Template files"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:183
+msgid "Template files in this class"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
+#: admin/systems/class_faiStartup.inc:64 config/fai/class_faiConfig.inc:41
+msgid "FAI"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:142
+msgid "File path"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:142
+msgid "Complete absolute template file path and name"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:146
+msgid "Short description of the file"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:155
+msgid "Template attributes"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:159
+msgid "Template file content"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:159
+msgid "Content of the template file"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:163
+msgid "Owner and group of the file"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:166
+msgid "Owner"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:166
+msgid "File owner"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:171
+msgid "Group"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:171
+msgid "File group"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:180
+msgid "Access"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:180
+msgid "Access rights"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:123
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
+msgid "Partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
+msgid "FAI partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:344
+msgid "Discs"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:57
+msgid "Sort down"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:59
+msgid "Sort up"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:71
+msgid "File"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:72
+msgid "Date"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
+msgid "Available logs"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:159
+msgid "Selected log"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:163
+msgid "Content of the selected log"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:176
+msgid "FAI Logs Viewer"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:219
+msgid "Selected file"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:227
+#, php-format
+msgid "Selected file: %s"
+msgstr ""
+
+#: admin/systems/class_faiStartup.inc:65
+msgid "Full automated installation"
+msgstr ""
+
+#: admin/systems/class_faiStartup.inc:83
+msgid "FAI settings"
+msgstr ""
+
+#: admin/systems/class_faiStartup.inc:87
+msgid "FAI profil and release to be applied to this computer"
+msgstr ""
+
+#: admin/systems/class_faiStartup.inc:91
+msgid "FAI debian release to be installed on this computer"
+msgstr ""
+
+#: admin/systems/class_faiStartup.inc:95
+msgid "Profil"
+msgstr ""
+
+#: admin/systems/class_faiStartup.inc:95
+msgid "FAI profil to be applied to this computer"
+msgstr ""
+
+#: admin/systems/class_faiStartup.inc:103
+msgid "FAI Debian repository to be used for installation"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "URL"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "Repository url"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent server"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent repository server"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+msgid "Release used on this repository"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+msgid "Sections available on this repository"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid "Mirror mode"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid ""
+"Is this mirror an installation repository? Is its release a custom one?"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Local mirror"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Is this mirror a local or a network mirror?"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Architectures"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Processor architectures available on this repository"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Distribution"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Which distribution is this repository for"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "Path pattern"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "How this repository is organized (only for RPM repositories)"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:160
+msgid "Package repository"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:161
+msgid "Package repository information"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:173
+msgid "Repositories"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:178
+msgid "Repositories this server hosts"
+msgstr ""
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
+msgid "Argonaut FAI monitor"
+msgstr ""
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
+msgid "Argonaut FAI monitor settings"
+msgstr ""
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "Port"
+msgstr ""
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
+msgstr ""
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "Timeout"
+msgstr ""
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "The timeout for bad clients. 0 to disable."
+msgstr ""
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "CA certificate"
+msgstr ""
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "Path to the CA certificate file on Argonaut FAI monitor server"
+msgstr ""
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Log directory"
+msgstr ""
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Directory in which argonaut-fai-monitor will store its log"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:44
+msgid "Branch in which fai branches will be stored"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:59
+#, php-format
+msgid "Fai %s RDN"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:60
+#, php-format
+msgid "Relative branch in which fai %s will be stored"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:60
+msgid "s"
+msgstr ""
+
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
+msgid "Filter"
+msgstr ""
+
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
+msgid "A maximum of 200 entries will be shown here."
+msgstr ""
diff --git a/fai/locale/ar/fusiondirectory.po b/fai/locale/ar/fusiondirectory.po
index 0fd2771bb32e20683d580b5dede9e20b00c9da8e..d0dcf366f0724c40d657c50dc26e843f454a85f1 100644
--- a/fai/locale/ar/fusiondirectory.po
+++ b/fai/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -30,14 +30,14 @@ msgstr ""
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr "الخواص"
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr ""
 
@@ -47,20 +47,20 @@ msgid "Variables class name"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr "الوصف"
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr ""
 
@@ -75,7 +75,7 @@ msgstr ""
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -101,93 +101,97 @@ msgid "The content of the variable"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr ""
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr "خطأ"
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -265,7 +269,7 @@ msgstr ""
 msgid "FAI partition entry"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr ""
 
@@ -277,12 +281,12 @@ msgstr "النوع"
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr ""
 
@@ -310,147 +314,181 @@ msgstr ""
 msgid "Spare"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr "إعادة إعداد"
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point"
+#: admin/fai/class_faiPartition.inc:331
+msgid "Options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point for this partition"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:327
-msgid "Options"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
@@ -492,7 +530,7 @@ msgstr ""
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr ""
 
@@ -544,8 +582,8 @@ msgid "Edit configuration"
 msgstr ""
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -618,6 +656,10 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr ""
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr ""
@@ -716,24 +758,32 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr ""
 
diff --git a/fai/locale/ca/fusiondirectory.po b/fai/locale/ca/fusiondirectory.po
index d30a0e0682c0023715cb20ed8798e0a9e10601ed..f7d659ccb302276bc2d7cb86240ee1ae283dd6e9 100644
--- a/fai/locale/ca/fusiondirectory.po
+++ b/fai/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -30,14 +30,14 @@ msgstr ""
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr ""
 
@@ -47,20 +47,20 @@ msgid "Variables class name"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr ""
 
@@ -75,7 +75,7 @@ msgstr ""
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -101,93 +101,97 @@ msgid "The content of the variable"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr ""
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr "Error"
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -265,7 +269,7 @@ msgstr ""
 msgid "FAI partition entry"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr ""
 
@@ -277,12 +281,12 @@ msgstr ""
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr ""
 
@@ -310,147 +314,181 @@ msgstr ""
 msgid "Spare"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr "Contrasenya"
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point"
+#: admin/fai/class_faiPartition.inc:331
+msgid "Options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point for this partition"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:327
-msgid "Options"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
@@ -492,7 +530,7 @@ msgstr ""
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr ""
 
@@ -544,8 +582,8 @@ msgid "Edit configuration"
 msgstr ""
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -618,6 +656,10 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr ""
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr ""
@@ -716,24 +758,32 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr ""
 
diff --git a/fai/locale/cs_CZ/fusiondirectory.po b/fai/locale/cs_CZ/fusiondirectory.po
index fdf4be53720c0adea15cb58c8b4049e587d614b1..fe4aed560c9ee399dfe5cbabe080d4e6d4c39f82 100644
--- a/fai/locale/cs_CZ/fusiondirectory.po
+++ b/fai/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/fai/class_faiVariable.inc:28
 msgid "Variable"
@@ -30,14 +30,14 @@ msgstr "proměnná pro FAI"
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr "vlastnosti"
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr "název třídy"
 
@@ -47,20 +47,20 @@ msgid "Variables class name"
 msgstr "Název třídy proměnných"
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr "popis"
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr "Stručný popis třídy"
 
@@ -75,7 +75,7 @@ msgstr "Proměnné v této třídě"
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -101,23 +101,19 @@ msgid "The content of the variable"
 msgstr "Obsah proměnné"
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr "šifrované"
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr "zaveditelné (bootovatelné)"
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr "zachovat"
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr "chyba"
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
@@ -126,70 +122,78 @@ msgstr ""
 "Oddíl nemůže být smazán když je používán v definici jednotky datového "
 "úložiště „%s“!"
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr "položka tabulky rozdělení úložiště"
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr "položka tabulky rozdělení úložiště pro FAI"
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr "zařízení"
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr "Název disku"
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr "Stručný popis"
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr "položka v /etc/fstab"
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr "jmenovka"
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr "Označení jednotky datového úložiště"
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr "Náhodný limit"
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr "Přepsat všechny oddíly k šifrování náhodnými daty"
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr "Položky oddílů"
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr "Kombinované fyzické oddíly"
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr "Oddíly v této třídě"
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr "V nastavení máte čtyři položky primárního oddílu"
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -269,7 +273,7 @@ msgstr ""
 msgid "FAI partition entry"
 msgstr "FAI položka oddílu"
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr "Oddíl"
 
@@ -281,12 +285,12 @@ msgstr "typ"
 msgid "Partition type"
 msgstr "typ oddílu"
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr "hlavní"
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr "logický"
 
@@ -314,147 +318,183 @@ msgstr ""
 msgid "Spare"
 msgstr "Náhradní"
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr "Náhradní zařízení v RAID"
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr "Chybí RAID zařízení"
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr "Oddíl který zašifrovat"
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr "Heslo"
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+"Šifrovací heslo. Pokud chcete namísto něj použít soubor se šifrovacím "
+"klíčem, nevyplňujte."
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr "Změnit velikost stávajícího oddílu"
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr "Zaveditelný"
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr "Zachovat"
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr "Oddíl je třeba zachovat"
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr "Nikdy"
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr "Vždy"
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr "Přeinstalovat"
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr "Souborový systém"
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
-msgstr "prostor pro odložení paměťových stránek (swap)"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
+msgstr "swap"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr "ext2"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr "ext3"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr "ext4"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr "reiser fs"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr "xfs"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr "btrfs"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr "LVM/RAID"
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
-msgstr "Šifrované"
-
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point"
 msgstr "přípojný bod"
 
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr "volby"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
+msgstr "volby připojování"
+
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr "Vytvořit předvolby"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr "Předvolby vytváření souborového systému"
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr "Možnosti vyladění"
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr "Předvolby vyladění souborového systému"
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr "volby připojování"
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr "RAID 0"
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr "RAID 1"
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr "RAID 5"
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr "RAID 6"
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr "LUKS"
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr "Swap"
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr "tmp"
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr "Nastavení šifrování"
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr "Pole RAID nelze vytvořit z méně než dvou oddílů!"
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr "Pole RAID 0 může obsahovat pouze a jedině dva oddíly!"
@@ -497,7 +537,7 @@ msgstr "profil FAI"
 msgid "FAI Profile"
 msgstr "Sada nastavení FAI"
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr "Název třídy tabulky oddílů"
 
@@ -552,8 +592,8 @@ msgid "Edit configuration"
 msgstr "Upravit nastavení"
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -626,6 +666,10 @@ msgstr "háčky"
 msgid "Task"
 msgstr "úkol"
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr "Úloha kterou spustit"
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr "Skript tohoto háčku"
@@ -724,24 +768,32 @@ msgstr "přístup"
 msgid "Access rights"
 msgstr "Přístupová práva"
 
-#: admin/fai/class_faiPartitionTable.inc:111
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
+msgstr "Přidat jednotku"
+
+#: admin/fai/class_faiPartitionTable.inc:115
 msgid "Add RAID"
 msgstr "přidat RAID"
 
-#: admin/fai/class_faiPartitionTable.inc:115
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr "Přidat LVM"
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr "Přidat cryptsetup"
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr "tabulka rozdělení úložiště"
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr "tabulka dělení úložiště pro FAI"
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr "úložné jednotky"
 
diff --git a/fai/locale/de/fusiondirectory.po b/fai/locale/de/fusiondirectory.po
index 59f7de8ff75cbe7fe92202a4f1426a7e29093461..d97d12545114f86189ef89c4690085b7ca58ba52 100644
--- a/fai/locale/de/fusiondirectory.po
+++ b/fai/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -30,14 +30,14 @@ msgstr "FAI-Variable"
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr "Eigenschaften"
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr "Klassen-Name"
 
@@ -47,20 +47,20 @@ msgid "Variables class name"
 msgstr "Variablenklassenname"
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr "Beschreibung"
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr "Kurze Beschreibung von der Klasse"
 
@@ -75,7 +75,7 @@ msgstr "Variablen in dieser Klasse"
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -101,93 +101,97 @@ msgid "The content of the variable"
 msgstr "Der Inhalt der Variable"
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr "verschlüsselt"
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr "bootbar"
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr "bewahren"
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr "Fehler"
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr "Partitionstabellen-Eintrag"
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr "FAI-Partitionstabellen-Eintrag"
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr "Gerät"
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr "Festplattenname"
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr "Kurze Beschreibung"
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr "fstab-Schlüssel"
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr "Label"
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr "Disk-Label"
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr "Partitions-Einträge"
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr "Kombinierte physikalische Partitionen"
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr "Partitionen in dieser Klasse"
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -265,7 +269,7 @@ msgstr "Partitionseintrag"
 msgid "FAI partition entry"
 msgstr "FAI-Partitionseintrag"
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr "Partition"
 
@@ -277,12 +281,12 @@ msgstr "Typ"
 msgid "Partition type"
 msgstr "Partitionstyp"
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr "primär"
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr "logisch"
 
@@ -310,147 +314,181 @@ msgstr ""
 msgid "Spare"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr "Fehlt"
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr "Passwort"
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr "Größe ändern"
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr "Existierende Partition in Größe anpassen"
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr "Bootbar"
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr "Bewahren"
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr "Nie"
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr "Immer"
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr "Erneut installieren"
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr "Dateisystem"
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
-msgstr "Auslagerungsspeicher"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
+msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr "ext2"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr "ext3"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr "ext4"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr "reiser fs"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr "xfs"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr "btrfs"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr "LVM/RAID"
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
-msgstr "Verschlüsselt"
-
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point"
 msgstr "Einhänge-Pfad"
 
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr "Optionen"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
+msgstr "Mount-Optionen"
+
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr "Optionen aktivieren"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr "Dateisystem Erstell-Optionen"
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr "Optimierungs-Optionen"
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr "Mount-Optionen"
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr "RAID 0"
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr "RAID 1"
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr "RAID 5"
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr "RAID 6"
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr "RAID-Arrays müssen mindestens zwei Partitionen enthalten!"
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
@@ -494,7 +532,7 @@ msgstr "FAI-Profil"
 msgid "FAI Profile"
 msgstr "FAI Profil"
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr "Partitionstabellen-Klassenname"
 
@@ -546,8 +584,8 @@ msgid "Edit configuration"
 msgstr "Konfiguration bearbeiten"
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -620,6 +658,10 @@ msgstr "Hooks"
 msgid "Task"
 msgstr "Vorgang"
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr ""
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr ""
@@ -718,24 +760,32 @@ msgstr "Zugriff"
 msgid "Access rights"
 msgstr "Zugriffsrechte"
 
-#: admin/fai/class_faiPartitionTable.inc:111
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:115
 msgid "Add RAID"
 msgstr "RAID hinzufügen"
 
-#: admin/fai/class_faiPartitionTable.inc:115
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr "LVM hinzufügen"
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr "Partitionstabelle"
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr "FAI-Partitionstabelle"
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr "Festplatten"
 
diff --git a/fai/locale/el_GR/fusiondirectory.po b/fai/locale/el_GR/fusiondirectory.po
index 8dbee854991ebde2eb627f8edc4e205673de8f85..ffc88abe30b21f351fa4af146d9e77b660ea991c 100644
--- a/fai/locale/el_GR/fusiondirectory.po
+++ b/fai/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -30,14 +30,14 @@ msgstr "Μεταβλητή FAI"
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr "Ιδιότητες"
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr "Όνομα κλάσης"
 
@@ -47,20 +47,20 @@ msgid "Variables class name"
 msgstr "Όνομα κλάσης μεταβλητών"
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr "Περιγραφή"
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr "Μια σύντομη περιγραφή της κλάσης"
 
@@ -75,7 +75,7 @@ msgstr "Μεταβλητές σε αυτή την κλάση"
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -101,93 +101,97 @@ msgid "The content of the variable"
 msgstr "Το περιεχόμενο της μεταβλητής."
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr "κρυπτογραφημένο"
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr "εκκινήσιμο"
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr "ρεζέρβα"
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr "Καταχώριση πίνακα κατατμήσεων"
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr "Καταχώριση πίνακα κατατμήσεων FAI"
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr "Συσκευή"
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr "κλειδί fstab"
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr "Ετικέτα"
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr "Ετικέτα δίσκου "
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr "Καταχωρίσεις κατάτμησης"
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr "Συνδυασμένες φυσικές κατατμήσεις"
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr "Κατατμήσεις σε αυτή την κλάση"
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -265,7 +269,7 @@ msgstr ""
 msgid "FAI partition entry"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr "Κατάτμηση"
 
@@ -277,12 +281,12 @@ msgstr "Τύπος"
 msgid "Partition type"
 msgstr "Τύπος κατάτμησης"
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr "Πρωτεύον"
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr "Λογικό"
 
@@ -310,148 +314,182 @@ msgstr ""
 msgid "Spare"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr "Κωδικός πρόσβασης:"
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr "Αλλαγή μεγέθους υπάρχουσας κατάτμησης"
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr "Εκκινήσιμη"
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr "Διατήρηση"
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr "Ποτέ"
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr "Επανεγκατάσταση"
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr "Σύστημα αρχείων"
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
-msgstr "χώρος swap "
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
+msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr "ext2"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr "ext3"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr "ext4"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr "reiser fs"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr "xfs"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr "btrfs"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr "LVM/RAID"
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
-msgstr "Κρυπτογραφημένο"
-
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point"
 msgstr "Σημείο προσάρτησης"
 
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr " Επιλογές"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
+msgstr "Επιλογές προσάρτησης"
+
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr "Επιλογές δημιουργίας συστήματος αρχείων"
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr "Επιλογές ρύθμισης"
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr "Επιλογές προσάρτησης"
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr "RAID 0"
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr "RAID 1"
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr "RAID 5"
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr "RAID 6"
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 "Οι συστοιχίες Raid θα πρέπει να περιέχουν τουλάχιστον δύο κατατμήσεις!"
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
@@ -493,7 +531,7 @@ msgstr "Προφίλ FAI "
 msgid "FAI Profile"
 msgstr "Προφίλ FAI "
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr "Όνομα κλάσης πίνακα κατατμήσεων"
 
@@ -545,8 +583,8 @@ msgid "Edit configuration"
 msgstr "Επεξεργασία ρυθμίσεων"
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -619,6 +657,10 @@ msgstr "Hooks"
 msgid "Task"
 msgstr "Εργασία"
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr ""
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr "Το σενάριο εντολών για αυτό το hook"
@@ -719,24 +761,32 @@ msgstr "Πρόσβαση"
 msgid "Access rights"
 msgstr "Δικαιώματα πρόσβασης"
 
-#: admin/fai/class_faiPartitionTable.inc:111
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:115
 msgid "Add RAID"
 msgstr "Προσθήκη RAID"
 
-#: admin/fai/class_faiPartitionTable.inc:115
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr "Προσθήκη LVM"
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr "Πίνακας κατατμήσεων"
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr "Πίνακας κατατμήσεων FAI"
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr "Δίσκοι"
 
diff --git a/fai/locale/es/fusiondirectory.po b/fai/locale/es/fusiondirectory.po
index 64b18fa3fabcac0cb86b30220856c0328117de37..9da8d1be878f2f9a74202d3b324ab34485796268 100644
--- a/fai/locale/es/fusiondirectory.po
+++ b/fai/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -30,14 +30,14 @@ msgstr "Variable FAI"
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr "Propiedades"
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr "Nombre de clase"
 
@@ -47,20 +47,20 @@ msgid "Variables class name"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr "Descripción"
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr ""
 
@@ -75,7 +75,7 @@ msgstr ""
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -101,93 +101,97 @@ msgid "The content of the variable"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr "encriptado"
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr "inicializable"
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr "preservar"
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr "Error"
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr "Entrada en la tabla de particiones"
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr "Entrada en la tabla de particiones FAI"
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr "Dispositivo"
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr "clave fstab"
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr "Etiqueta"
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr "Etiqueta de disco"
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr "Entradas en la partición"
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr "Particiones físicas combinadas"
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -265,7 +269,7 @@ msgstr ""
 msgid "FAI partition entry"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr "Partición"
 
@@ -277,12 +281,12 @@ msgstr "Tipo"
 msgid "Partition type"
 msgstr "Tipo de partición"
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr "primario"
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr "Lógico"
 
@@ -310,147 +314,181 @@ msgstr ""
 msgid "Spare"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr "Contraseña"
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr "Redimensionar partición existente"
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr "Inicializable"
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr "Preservar"
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr "Reinstalar"
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr "Sistemas de archivos"
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
-msgstr "espacio de intercambio"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
+msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr "ext2"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr "ext3"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr "ext4"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr "reiser fs"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr "xfs"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr "btrfs"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
-msgstr "Encriptado"
-
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point"
 msgstr "Punto de montaje"
 
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr "Opciones"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
+msgstr "Opciones de Montaje"
+
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr "Crear opciones"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr "Crear opciones del sistema de archivos"
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr "Opciones de ajuste"
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr "Opciones de Montaje"
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr "RAID 0"
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr "RAID 1"
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr "RAID 5"
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr "RAID 6"
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr "¡La matriz de discos RAID debe tener al menos dos particiones!"
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
@@ -494,7 +532,7 @@ msgstr "Perfil FAI"
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr ""
 
@@ -546,8 +584,8 @@ msgid "Edit configuration"
 msgstr ""
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -620,6 +658,10 @@ msgstr "Métodos"
 msgid "Task"
 msgstr "Tarea"
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr ""
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr ""
@@ -718,24 +760,32 @@ msgstr "Acceso"
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:115
 msgid "Add RAID"
 msgstr "Añadir RAID"
 
-#: admin/fai/class_faiPartitionTable.inc:115
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr "Tabla de particiones"
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr "Tabla de particiones FAI"
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr "Discos"
 
diff --git a/fai/locale/es_CO/fusiondirectory.po b/fai/locale/es_CO/fusiondirectory.po
index 7ccf39bb975de4cb57a56815329ed5c700eb4317..7803a7cad161948f618a47955bc64d4cc6f61720 100644
--- a/fai/locale/es_CO/fusiondirectory.po
+++ b/fai/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -30,14 +30,14 @@ msgstr ""
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr "Propiedades"
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr ""
 
@@ -47,20 +47,20 @@ msgid "Variables class name"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr "Descripción"
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr ""
 
@@ -75,7 +75,7 @@ msgstr ""
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -101,93 +101,97 @@ msgid "The content of the variable"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr ""
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr "Error"
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -265,7 +269,7 @@ msgstr ""
 msgid "FAI partition entry"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr ""
 
@@ -277,12 +281,12 @@ msgstr "Tipo"
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr ""
 
@@ -310,147 +314,181 @@ msgstr ""
 msgid "Spare"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr "Contraseña"
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point"
+#: admin/fai/class_faiPartition.inc:331
+msgid "Options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point for this partition"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:327
-msgid "Options"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
@@ -492,7 +530,7 @@ msgstr ""
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr ""
 
@@ -544,8 +582,8 @@ msgid "Edit configuration"
 msgstr ""
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -618,6 +656,10 @@ msgstr "Hooks"
 msgid "Task"
 msgstr ""
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr ""
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr ""
@@ -716,24 +758,32 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr ""
 
diff --git a/fai/locale/es_VE/fusiondirectory.po b/fai/locale/es_VE/fusiondirectory.po
index 50b7183e9ac76719b15c2c795083b046d9c82374..dbd5b76652ef757a2fe724c252e981e2dade9ecc 100644
--- a/fai/locale/es_VE/fusiondirectory.po
+++ b/fai/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -30,14 +30,14 @@ msgstr "Variable FAI"
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr "Propiedades"
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr "Nombre de clase"
 
@@ -47,20 +47,20 @@ msgid "Variables class name"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr "Descripción"
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr ""
 
@@ -75,7 +75,7 @@ msgstr ""
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -101,93 +101,97 @@ msgid "The content of the variable"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr "encriptado"
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr "inicializable"
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr "preservar"
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr "Error"
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr "Entrada en la tabla de particiones"
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr "Entrada en la tabla de particiones FAI"
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr "Dispositivo"
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr "clave fstab"
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr "Etiqueta"
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr "Etiqueta de disco"
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr "Entradas en la partición"
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr "Particiones físicas combinadas"
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -265,7 +269,7 @@ msgstr ""
 msgid "FAI partition entry"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr "Partición"
 
@@ -277,12 +281,12 @@ msgstr "Tipo"
 msgid "Partition type"
 msgstr "Tipo de partición"
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr "primario"
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr "Lógico"
 
@@ -310,147 +314,181 @@ msgstr ""
 msgid "Spare"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr "Contraseña"
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr "Redimensionar partición existente"
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr "Inicializable"
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr "Preservar"
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr "Reinstalar"
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr "Sistemas de archivos"
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
-msgstr "espacio de intercambio"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
+msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr "ext2"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr "ext3"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr "ext4"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr "reiser fs"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr "xfs"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr "btrfs"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
-msgstr "Encriptado"
-
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point"
 msgstr "Punto de montaje"
 
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr "Opciones"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
+msgstr "Opciones de Montaje"
+
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr "Crear opciones"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr "Crear opciones del sistema de archivos"
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr "Opciones de ajuste"
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr "Opciones de Montaje"
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr "RAID 0"
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr "RAID 1"
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr "RAID 5"
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr "RAID 6"
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr "¡La matriz de discos RAID debe tener al menos dos particiones!"
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
@@ -494,7 +532,7 @@ msgstr "Perfil FAI"
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr ""
 
@@ -546,8 +584,8 @@ msgid "Edit configuration"
 msgstr ""
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -620,6 +658,10 @@ msgstr "Métodos"
 msgid "Task"
 msgstr "Tarea"
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr ""
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr ""
@@ -718,24 +760,32 @@ msgstr "Acceso"
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:115
 msgid "Add RAID"
 msgstr "Añadir RAID"
 
-#: admin/fai/class_faiPartitionTable.inc:115
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr "Tabla de particiones"
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr "Tabla de particiones FAI"
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr "Discos"
 
diff --git a/fai/locale/fa_IR/fusiondirectory.po b/fai/locale/fa_IR/fusiondirectory.po
index 553da4accb3a34659d55021848d63ee095a90008..7185f8c09f0774fb7ba75b1e8093d1af31a4b018 100644
--- a/fai/locale/fa_IR/fusiondirectory.po
+++ b/fai/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa_IR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/fai/class_faiVariable.inc:28
 msgid "Variable"
@@ -30,14 +30,14 @@ msgstr ""
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr ""
 
@@ -47,20 +47,20 @@ msgid "Variables class name"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr ""
 
@@ -75,7 +75,7 @@ msgstr ""
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -101,93 +101,97 @@ msgid "The content of the variable"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr ""
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr "خطا"
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -265,7 +269,7 @@ msgstr ""
 msgid "FAI partition entry"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr ""
 
@@ -277,12 +281,12 @@ msgstr ""
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr ""
 
@@ -310,147 +314,181 @@ msgstr ""
 msgid "Spare"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point"
+#: admin/fai/class_faiPartition.inc:331
+msgid "Options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point for this partition"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:327
-msgid "Options"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
@@ -492,7 +530,7 @@ msgstr ""
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr ""
 
@@ -544,8 +582,8 @@ msgid "Edit configuration"
 msgstr ""
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -618,6 +656,10 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr ""
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr ""
@@ -716,24 +758,32 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr ""
 
diff --git a/fai/locale/fi_FI/fusiondirectory.po b/fai/locale/fi_FI/fusiondirectory.po
index 58fec50553e60c97fa78bd45cfe3eec1b13e421d..7bb660d98c206b32a174179986dbe6d01d1184f2 100644
--- a/fai/locale/fi_FI/fusiondirectory.po
+++ b/fai/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
@@ -30,14 +30,14 @@ msgstr ""
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr "Ominaisuudet"
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr "Luokan nimi"
 
@@ -47,20 +47,20 @@ msgid "Variables class name"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr "Kuvaus"
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr "Luokan lyhyt kuvaus"
 
@@ -75,7 +75,7 @@ msgstr ""
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -101,93 +101,97 @@ msgid "The content of the variable"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr ""
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr "Virhe"
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -265,7 +269,7 @@ msgstr ""
 msgid "FAI partition entry"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr ""
 
@@ -277,12 +281,12 @@ msgstr "Tyyppi"
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr ""
 
@@ -310,147 +314,181 @@ msgstr ""
 msgid "Spare"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr "Salasana"
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point"
+#: admin/fai/class_faiPartition.inc:331
+msgid "Options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point for this partition"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:327
-msgid "Options"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
@@ -492,7 +530,7 @@ msgstr ""
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr ""
 
@@ -544,8 +582,8 @@ msgid "Edit configuration"
 msgstr "Muokkaa asetuksia"
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -618,6 +656,10 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr ""
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr ""
@@ -716,24 +758,32 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr ""
 
diff --git a/fai/locale/fr/fusiondirectory.po b/fai/locale/fr/fusiondirectory.po
index d08d2fe704d553338fa89d66353f2317f3fae0cb..5b7e3ce57d75cf3b3abe99a8464599c01a743656 100644
--- a/fai/locale/fr/fusiondirectory.po
+++ b/fai/locale/fr/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2018\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"
@@ -30,14 +30,14 @@ msgstr "Variable FAI"
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr "Propriétés"
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr "Nom de la classe"
 
@@ -47,20 +47,20 @@ msgid "Variables class name"
 msgstr "Nom de la classe variables"
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr "Description"
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr "Une courte description de cette classe"
 
@@ -75,7 +75,7 @@ msgstr "Variables dans cette classe"
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -101,23 +101,19 @@ msgid "The content of the variable"
 msgstr "Le contenu de la variable"
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr "chiffré"
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr "amorçable"
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr "préserver"
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr "Erreur"
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
@@ -126,71 +122,80 @@ msgstr ""
 "Ce disque ne peut pas être supprimé car il est utilisé par la définition de "
 "disque \"%s\" !"
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr "Entrée de la table des partitions"
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr "Entrée de la table de partition FAI"
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr "Périphérique"
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr "Nom du disque"
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr "Description courte"
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr "Entrée fstab"
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr "Clé à utiliser dans le fichier fstab"
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr "Étiquette"
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr "Étiquette du disque"
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr "Initialisation aléatoire"
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+"Initialiser toutes les partitions chiffrées avec des données aléatoires"
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr "Liste de partitions"
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr "Partitions physiques combinées"
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr "Combination des partitions physiques dans volume LVM"
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr "Partitions dans cette classe"
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 "Vous avez plus de quatre partitions primaires dans votre configuration."
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -270,7 +275,7 @@ msgstr "Entrée de la table des partitions"
 msgid "FAI partition entry"
 msgstr "Entrée de la table de partition FAI"
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr "Partition"
 
@@ -282,12 +287,12 @@ msgstr "Type"
 msgid "Partition type"
 msgstr "Type de partition"
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr "Primaire"
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr "Logique"
 
@@ -315,147 +320,183 @@ msgstr "Combination des partitions physiques dans ce RAID"
 msgid "Spare"
 msgstr "De rechange"
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr "Périphérique Raid de secours"
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr "Manquant"
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr "périphérique Raid manquant"
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr "Partition à chiffrer"
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr "Mot de passe"
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+"Mot de passe à utiliser pour le cryptage. Laissez vide pour utiliser un "
+"fichier de clé de chiffrement à la place."
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr "Redimensionner"
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr "Redimensionner une partition existante"
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr "Amorçable"
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr "La partition doit elle être bootable"
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr "Préserver"
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr "La partition doit-elle être conservée"
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr "Jamais"
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr "Toujours"
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr "Réinstaller"
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr "Système de fichier"
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr "Le système de fichiers cette partition doit être formatée avec"
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
-msgstr "taille de la swap"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
+msgstr "swap"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr "ext2"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr "ext3"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr "ext4"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr "reiser fs"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr "xfs"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr "btrfs"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr "LVM/RAID"
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
-msgstr "Chiffré"
-
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
-msgstr "Si oui ou non cette partition est chiffré"
-
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point"
 msgstr "Point de montage"
 
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point for this partition"
 msgstr "Point de montage pour cette partition"
 
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr "Options"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
+msgstr "Options de montage"
+
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
+msgstr "Options de montage du système de fichier"
+
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr "Créer des options"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr "Options de création du système de fichier"
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr "Options de tuning"
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr "Options de tuning du système de fichier"
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr "Options de montage"
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr "Options de montage du système de fichier"
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr "RAID 0"
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr "RAID 1"
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr "RAID 5"
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr "RAID 6"
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr "LUKS"
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr "Swap"
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr "tmp"
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr "Paramètres de chiffrement"
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr "Les ensembles RAID doivent contenir au moins 2 partitions !"
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
@@ -498,7 +539,7 @@ msgstr "Profil FAI"
 msgid "FAI Profile"
 msgstr "Profil FAI"
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr "Nom de la classe de partition"
 
@@ -554,8 +595,8 @@ msgid "Edit configuration"
 msgstr "Éditer la configuration"
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -628,6 +669,10 @@ msgstr "Connexions"
 msgid "Task"
 msgstr "Tâches"
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr "Tâche à exécuter"
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr "Le script de ce hook"
@@ -726,24 +771,32 @@ msgstr "Accès"
 msgid "Access rights"
 msgstr "Droits d'accès"
 
-#: admin/fai/class_faiPartitionTable.inc:111
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
+msgstr "Ajouter un disque"
+
+#: admin/fai/class_faiPartitionTable.inc:115
 msgid "Add RAID"
 msgstr "Ajouter du RAID"
 
-#: admin/fai/class_faiPartitionTable.inc:115
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr "Ajouter un LVM"
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr "Ajouter cryptsetup"
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr "Table des partitions"
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr "Table des partitions FAI"
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr "Disques"
 
diff --git a/fai/locale/hu_HU/fusiondirectory.po b/fai/locale/hu_HU/fusiondirectory.po
index 230623c7e4ad5f2bcfa1142ab8482701a71e6d16..a59264ac7dbc4eff21928fcc19afd0c694c3e82e 100644
--- a/fai/locale/hu_HU/fusiondirectory.po
+++ b/fai/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -30,14 +30,14 @@ msgstr ""
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr ""
 
@@ -47,20 +47,20 @@ msgid "Variables class name"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr "Leírás"
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr ""
 
@@ -75,7 +75,7 @@ msgstr ""
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -101,93 +101,97 @@ msgid "The content of the variable"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr ""
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -265,7 +269,7 @@ msgstr ""
 msgid "FAI partition entry"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr ""
 
@@ -277,12 +281,12 @@ msgstr ""
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr ""
 
@@ -310,147 +314,181 @@ msgstr ""
 msgid "Spare"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point"
+#: admin/fai/class_faiPartition.inc:331
+msgid "Options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point for this partition"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:327
-msgid "Options"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
@@ -492,7 +530,7 @@ msgstr ""
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr ""
 
@@ -544,8 +582,8 @@ msgid "Edit configuration"
 msgstr ""
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -618,6 +656,10 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr ""
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr ""
@@ -716,24 +758,32 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr ""
 
diff --git a/fai/locale/id/fusiondirectory.po b/fai/locale/id/fusiondirectory.po
index 40187652b2224e7f9000bc51aded9c413630a7f7..d2ef1cca5148bfb58f4e79a97acf98d519bba8a7 100644
--- a/fai/locale/id/fusiondirectory.po
+++ b/fai/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -29,14 +29,14 @@ msgstr ""
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr ""
 
@@ -46,20 +46,20 @@ msgid "Variables class name"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr ""
 
@@ -74,7 +74,7 @@ msgstr ""
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -100,93 +100,97 @@ msgid "The content of the variable"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr ""
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -264,7 +268,7 @@ msgstr ""
 msgid "FAI partition entry"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr ""
 
@@ -276,12 +280,12 @@ msgstr ""
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr ""
 
@@ -309,147 +313,181 @@ msgstr ""
 msgid "Spare"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point"
+#: admin/fai/class_faiPartition.inc:331
+msgid "Options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point for this partition"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:327
-msgid "Options"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
@@ -491,7 +529,7 @@ msgstr ""
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr ""
 
@@ -543,8 +581,8 @@ msgid "Edit configuration"
 msgstr ""
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -617,6 +655,10 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr ""
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr ""
@@ -715,24 +757,32 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr ""
 
diff --git a/fai/locale/it_IT/fusiondirectory.po b/fai/locale/it_IT/fusiondirectory.po
index f34738b26bfbf9791a4792003d76d9a883135481..741a20cbeac3091ed784fc50c75ef47487da2b3d 100644
--- a/fai/locale/it_IT/fusiondirectory.po
+++ b/fai/locale/it_IT/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2018\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"
@@ -30,14 +30,14 @@ msgstr "Variabile FAI"
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr "Proprietà"
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr "Nome della classe"
 
@@ -47,20 +47,20 @@ msgid "Variables class name"
 msgstr "Nome di classe variabile"
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr "Descrizione"
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr "Breve descrizione della classe"
 
@@ -75,7 +75,7 @@ msgstr "Variabili di questa classe"
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -101,23 +101,19 @@ msgid "The content of the variable"
 msgstr "Contenuto della variabile"
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr "criptato"
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr "Avviabile"
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr "preserve"
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr "Errore"
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
@@ -126,70 +122,78 @@ msgstr ""
 "La partizione non può essere rimossa mentre é in uso nella definizione del "
 "disco '%s' !"
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr "Elenco della tavola delle partizioni"
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr "Elenco della tavola delle partizioni FAI"
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr "Dispositivi"
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr "Nome del disco"
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr "Breve descrizione"
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr "Elenco fstab"
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr "Chiave da usare nel file fstab"
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr "Etichetta"
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr "Etichetta del disco"
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr "Init casuale"
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr "Inizializza tutte le partizioni crittografate con dati casuali"
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr "Elenco delle partizioni"
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr "Combinazione delle partizioni fisiche"
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr "Partizioni fisiche combinate in questo volume LVM"
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr "Partizioni in questa classe"
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 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:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -270,7 +274,7 @@ msgstr "Elenco delle partizioni"
 msgid "FAI partition entry"
 msgstr "Elenco delle partizioni FAI"
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr "Partizione"
 
@@ -282,12 +286,12 @@ msgstr "Tipo"
 msgid "Partition type"
 msgstr "Tipo di partizione"
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr "Primario"
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr "Logico"
 
@@ -315,147 +319,183 @@ msgstr "Combinazione delle partizioni fisiche in questo RAID"
 msgid "Spare"
 msgstr "Spare"
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr "Dispositivo Spare Raid"
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr "Mancante"
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr "Dispositivo Raid mancante"
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr "Partizione da crittografare"
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr "Password"
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+"Password da utilizzare per la crittografia. Lasciare vuoto per utilizzare "
+"invece un file di chiave di crittografia."
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr "Ridimensiona"
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr "Ridimensiona una partizione esistente"
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr "Avviabile"
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr "Se questa partizione puo' essere avviata o no"
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr "Preserva"
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr "La partizione deve essere preservata?"
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr "Mai"
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr "Sempre"
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr "Installa di nuovo"
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr "File system"
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr "Il filesystem con cui questa partizione dovrebbe essere formattata"
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
-msgstr "dimensione della swap"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
+msgstr "scambiare"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr "ext2"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr "ext3"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr "ext4"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr "reiser fs"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr "xfs"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr "btrfs"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr "LVM/RAID "
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
-msgstr "Criptato"
-
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
-msgstr "Se questa partizione é criptata o no"
-
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point"
 msgstr "Punto di montaggio"
 
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point for this partition"
 msgstr "Punto culminante per questa partizione"
 
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr "Opzioni"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
+msgstr "Opzioni di montaggio"
+
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
+msgstr "Opzioni di montaggio filesystem"
+
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr "Creare opzioni"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr "Opzioni per la creazione del file system"
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr "Opzioni di tuning"
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr "Opzioni di filesystem tune"
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr "Opzioni di montaggio"
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr "Opzioni di montaggio filesystem"
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr "RAID 0"
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr "RAID 1"
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr "RAID 5"
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr "RAID 6"
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr "LUKS"
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr "Scambiare"
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr "tmp"
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr "Impostazioni di crittografia"
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr "Gli arrays RAID devono contenere almeno 2 partizioni !"
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr "Gli arrays RAID 0 possono essere composti solo da 2 partizioni !"
@@ -497,7 +537,7 @@ msgstr "Profilo FAI"
 msgid "FAI Profile"
 msgstr "Profilo FAI"
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr "Nome della tavola delle partizioni"
 
@@ -553,8 +593,8 @@ msgid "Edit configuration"
 msgstr "Modifica configurazione"
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -627,6 +667,10 @@ msgstr "Connessioni"
 msgid "Task"
 msgstr "Attività"
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr "Compito da eseguire"
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr "Lo script di questo hook"
@@ -725,24 +769,32 @@ msgstr "Accesso"
 msgid "Access rights"
 msgstr "Opzioni di accesso"
 
-#: admin/fai/class_faiPartitionTable.inc:111
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
+msgstr "Aggiungi disco"
+
+#: admin/fai/class_faiPartitionTable.inc:115
 msgid "Add RAID"
 msgstr "Aggiungi il RAID"
 
-#: admin/fai/class_faiPartitionTable.inc:115
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr "Aggiungi LVM"
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr "Aggiungi cryptsetup"
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr "Tavola delle partizioni"
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr "Tavola delle partizioni FAI"
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr "Dischi"
 
diff --git a/fai/locale/ja/fusiondirectory.po b/fai/locale/ja/fusiondirectory.po
index c20780b2ada767aa7b0ddf30a01de209fc505e02..3c7f4ec7c7a07efe74e3443e29b0d2fe94852eea 100644
--- a/fai/locale/ja/fusiondirectory.po
+++ b/fai/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -29,14 +29,14 @@ msgstr ""
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr ""
 
@@ -46,20 +46,20 @@ msgid "Variables class name"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr ""
 
@@ -74,7 +74,7 @@ msgstr ""
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -100,93 +100,97 @@ msgid "The content of the variable"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr ""
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -264,7 +268,7 @@ msgstr ""
 msgid "FAI partition entry"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr ""
 
@@ -276,12 +280,12 @@ msgstr ""
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr ""
 
@@ -309,147 +313,181 @@ msgstr ""
 msgid "Spare"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point"
+#: admin/fai/class_faiPartition.inc:331
+msgid "Options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point for this partition"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:327
-msgid "Options"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
@@ -491,7 +529,7 @@ msgstr ""
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr ""
 
@@ -543,8 +581,8 @@ msgid "Edit configuration"
 msgstr ""
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -617,6 +655,10 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr ""
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr ""
@@ -715,24 +757,32 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr ""
 
diff --git a/fai/locale/ko/fusiondirectory.po b/fai/locale/ko/fusiondirectory.po
index e89bf812b45b116ad4301e61a2b8350b30143fe3..a3e6ce28e58e279a3b4f9d434922ebe0edb36924 100644
--- a/fai/locale/ko/fusiondirectory.po
+++ b/fai/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
@@ -30,14 +30,14 @@ msgstr ""
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr "설정"
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr ""
 
@@ -47,20 +47,20 @@ msgid "Variables class name"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr "설명"
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr ""
 
@@ -75,7 +75,7 @@ msgstr ""
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -101,93 +101,97 @@ msgid "The content of the variable"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr ""
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr "오류"
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -265,7 +269,7 @@ msgstr ""
 msgid "FAI partition entry"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr ""
 
@@ -277,12 +281,12 @@ msgstr "타입"
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr ""
 
@@ -310,147 +314,181 @@ msgstr ""
 msgid "Spare"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr "패스워드"
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point"
 msgstr "마운트 포인트"
 
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr "옵션"
 
-#: admin/fai/class_faiPartition.inc:330
-msgid "Create options"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
-msgid "Filesystem create options"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
-msgid "Tune options"
+#: admin/fai/class_faiPartition.inc:339
+msgid "Create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
-msgid "Filesystem tune options"
+#: admin/fai/class_faiPartition.inc:339
+msgid "Filesystem create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
+#: admin/fai/class_faiPartition.inc:343
+msgid "Tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
+#: admin/fai/class_faiPartition.inc:343
+msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
@@ -492,7 +530,7 @@ msgstr ""
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr ""
 
@@ -544,8 +582,8 @@ msgid "Edit configuration"
 msgstr ""
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -618,6 +656,10 @@ msgstr ""
 msgid "Task"
 msgstr "태스크"
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr ""
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr ""
@@ -629,7 +671,7 @@ msgstr ""
 
 #: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
-msgstr ""
+msgstr "템플릿"
 
 #: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
@@ -716,24 +758,32 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr ""
 
diff --git a/fai/locale/lv/fusiondirectory.po b/fai/locale/lv/fusiondirectory.po
index 2483b9bbe3f7f6356816f4566d3f490872703d8e..84c8e0969d1f3f25383189a17359ecebb32d52e9 100644
--- a/fai/locale/lv/fusiondirectory.po
+++ b/fai/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -30,14 +30,14 @@ msgstr ""
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr ""
 
@@ -47,20 +47,20 @@ msgid "Variables class name"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr "Apraksts"
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr ""
 
@@ -75,7 +75,7 @@ msgstr ""
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -101,93 +101,97 @@ msgid "The content of the variable"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr ""
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr "Kļūda"
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -265,7 +269,7 @@ msgstr ""
 msgid "FAI partition entry"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr ""
 
@@ -277,12 +281,12 @@ msgstr "Veids"
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr ""
 
@@ -310,147 +314,181 @@ msgstr ""
 msgid "Spare"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point"
+#: admin/fai/class_faiPartition.inc:331
+msgid "Options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point for this partition"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:327
-msgid "Options"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
@@ -492,7 +530,7 @@ msgstr ""
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr ""
 
@@ -544,8 +582,8 @@ msgid "Edit configuration"
 msgstr ""
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -618,6 +656,10 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr ""
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr ""
@@ -716,24 +758,32 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr ""
 
diff --git a/fai/locale/nb/fusiondirectory.po b/fai/locale/nb/fusiondirectory.po
index 7766ec4d5778e618a6892e9f876ef2b9bc7a938b..8341cdf072631a543b603a4d8d63a1cde111213f 100644
--- a/fai/locale/nb/fusiondirectory.po
+++ b/fai/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -30,14 +30,14 @@ msgstr ""
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr "Egenskaper"
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr ""
 
@@ -47,20 +47,20 @@ msgid "Variables class name"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr "Beskrivelse"
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr ""
 
@@ -75,7 +75,7 @@ msgstr ""
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -101,93 +101,97 @@ msgid "The content of the variable"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr ""
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr "Feil"
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -265,7 +269,7 @@ msgstr ""
 msgid "FAI partition entry"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr ""
 
@@ -277,12 +281,12 @@ msgstr ""
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr ""
 
@@ -310,147 +314,181 @@ msgstr ""
 msgid "Spare"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point"
+#: admin/fai/class_faiPartition.inc:331
+msgid "Options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point for this partition"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:327
-msgid "Options"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
@@ -492,7 +530,7 @@ msgstr ""
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr ""
 
@@ -544,8 +582,8 @@ msgid "Edit configuration"
 msgstr ""
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -618,6 +656,10 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr ""
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr ""
@@ -716,24 +758,32 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr ""
 
diff --git a/fai/locale/nl/fusiondirectory.po b/fai/locale/nl/fusiondirectory.po
index fc8d4abc9b5b94580577819e8431340865a5b330..2fdc04109c450c6104cbad08d6bfb0345f977346 100644
--- a/fai/locale/nl/fusiondirectory.po
+++ b/fai/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Lucien Antonissen <lucien.antonissen@digipolis.be>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
@@ -30,14 +30,14 @@ msgstr "FAI variabel"
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr "Eigenschappen"
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr "Klassenaam"
 
@@ -47,20 +47,20 @@ msgid "Variables class name"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr "Omschrijving"
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr ""
 
@@ -75,7 +75,7 @@ msgstr ""
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -101,93 +101,97 @@ msgid "The content of the variable"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr "ge-encrypteerd"
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr "bootable"
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr "behouden"
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr "Fout"
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr "Partitie table invoer"
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr "FAI partitie table invoer"
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr "Apparaat"
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr "fstab key"
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr "Label"
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr "Disk label"
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr "Partitie regels"
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr "Gecombineerd fysieke partities"
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -265,7 +269,7 @@ msgstr ""
 msgid "FAI partition entry"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr "Partitie"
 
@@ -277,12 +281,12 @@ msgstr "Type"
 msgid "Partition type"
 msgstr "Partitie type"
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr "Primaire"
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr "Logische"
 
@@ -310,147 +314,181 @@ msgstr ""
 msgid "Spare"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr "Reserve Raid apparaat"
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr "Ontbrekend Raid apparaat"
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr "Paswoord"
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr "Resize bestaande partitie"
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr "Bootable"
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr "Bewaar"
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr "Moet de partitie bewaard worden"
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr "Nooit"
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr "Herinstalleer"
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr "Filesystem"
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
-msgstr "swap space"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
+msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr "ext2"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr "ext3"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr "ext4"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr "reiser fs"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr "xfs"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr "btrfs"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr "LVM/RAID"
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
-msgstr "Ge-encrypteerd"
-
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point"
 msgstr "Koppelpunt"
 
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr "Opties"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
+msgstr "Koppelopties"
+
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr "Opties aanmaken"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr "Filesystem creatie opties"
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr "Tune opties"
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr "Koppelopties"
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr "RAID 0"
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr "RAID 1"
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr "RAID 5"
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr "RAID 6"
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr "RAID-arrays moet ten minste twee partities bevatten!"
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
@@ -494,7 +532,7 @@ msgstr "FAI profiel"
 msgid "FAI Profile"
 msgstr "FAI profiel"
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr ""
 
@@ -546,8 +584,8 @@ msgid "Edit configuration"
 msgstr "Bewerk de configuratie"
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -620,6 +658,10 @@ msgstr "Inhakers"
 msgid "Task"
 msgstr "Taak"
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr "Uit te voeren taak"
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr ""
@@ -718,24 +760,32 @@ msgstr "Toegang"
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:115
 msgid "Add RAID"
 msgstr "Raid toevoegen"
 
-#: admin/fai/class_faiPartitionTable.inc:115
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr "Partitietabel"
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr "FAI partitie tafel"
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr "Schijven"
 
diff --git a/fai/locale/pl/fusiondirectory.po b/fai/locale/pl/fusiondirectory.po
index 2b439513af2790b438fd657f2f0396f45d93c5f3..e1b1d993f4d5e371a01aa2ed72a9312e7102c996 100644
--- a/fai/locale/pl/fusiondirectory.po
+++ b/fai/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -30,14 +30,14 @@ msgstr "Zmienna FAI"
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr "Właściwości"
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr "Nazwa klasy"
 
@@ -47,20 +47,20 @@ msgid "Variables class name"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr "Opis"
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr ""
 
@@ -75,7 +75,7 @@ msgstr ""
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -101,93 +101,97 @@ msgid "The content of the variable"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr ""
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr "Błąd"
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr "UrzÄ…dzenie"
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr "Partycje"
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -265,7 +269,7 @@ msgstr ""
 msgid "FAI partition entry"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr ""
 
@@ -277,12 +281,12 @@ msgstr "Typ"
 msgid "Partition type"
 msgstr "Typ partycji"
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr ""
 
@@ -310,147 +314,181 @@ msgstr ""
 msgid "Spare"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr "Hasło"
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr "Zachowaj"
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr "Przeinstaluj"
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point"
 msgstr "Punkt montowania"
 
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr "Opcje"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
+msgstr "Opcje montowania"
+
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr "Utwórz opcje"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr "Opcje montowania"
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
@@ -492,7 +530,7 @@ msgstr "Profil FAI"
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr ""
 
@@ -544,8 +582,8 @@ msgid "Edit configuration"
 msgstr ""
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -618,6 +656,10 @@ msgstr "Zaczepy"
 msgid "Task"
 msgstr "Zadanie"
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr ""
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr ""
@@ -716,24 +758,32 @@ msgstr "Dostęp"
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr "Tablica partycji"
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr "Tablica partycji FAI"
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr "Dyski"
 
diff --git a/fai/locale/pt/fusiondirectory.po b/fai/locale/pt/fusiondirectory.po
index d75c290643fc30c358898184380f91ca5fa8742e..96b8a8a956189540e452dc17fc481c8167c35180 100644
--- a/fai/locale/pt/fusiondirectory.po
+++ b/fai/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -30,14 +30,14 @@ msgstr ""
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr "Propriedades"
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr ""
 
@@ -47,20 +47,20 @@ msgid "Variables class name"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr "Descrição"
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr ""
 
@@ -75,7 +75,7 @@ msgstr ""
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -101,93 +101,97 @@ msgid "The content of the variable"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr ""
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr "Erro"
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -265,7 +269,7 @@ msgstr ""
 msgid "FAI partition entry"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr ""
 
@@ -277,12 +281,12 @@ msgstr "Tipo"
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr ""
 
@@ -310,147 +314,181 @@ msgstr ""
 msgid "Spare"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr "Senha"
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point"
+#: admin/fai/class_faiPartition.inc:331
+msgid "Options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point for this partition"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:327
-msgid "Options"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
@@ -492,7 +530,7 @@ msgstr ""
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr ""
 
@@ -544,8 +582,8 @@ msgid "Edit configuration"
 msgstr ""
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -618,6 +656,10 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr ""
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr ""
@@ -716,24 +758,32 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr ""
 
diff --git a/fai/locale/pt_BR/fusiondirectory.po b/fai/locale/pt_BR/fusiondirectory.po
index d44441b4fe56a62716f57e260775ee505d7da6fc..ec4d07053dc0e280f4d402dff2a97ece6123be3c 100644
--- a/fai/locale/pt_BR/fusiondirectory.po
+++ b/fai/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -30,14 +30,14 @@ msgstr ""
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr "Propriedades"
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr "Nome da classe"
 
@@ -47,20 +47,20 @@ msgid "Variables class name"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr "Descrição"
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr ""
 
@@ -75,7 +75,7 @@ msgstr ""
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -101,93 +101,97 @@ msgid "The content of the variable"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr "Encriptado"
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr "Bootável"
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr "preservar"
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr "Erro"
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr "Entrada na tabela de partição"
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr "Entrada na tabela de partição FAI"
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr "Dispositivo"
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr "Rótulo"
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -265,7 +269,7 @@ msgstr ""
 msgid "FAI partition entry"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr ""
 
@@ -277,12 +281,12 @@ msgstr "Tipo"
 msgid "Partition type"
 msgstr "Tipo de partição"
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr ""
 
@@ -310,147 +314,181 @@ msgstr ""
 msgid "Spare"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr "Senha"
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr "Reinstalar"
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point"
 msgstr "Ponto de montagem"
 
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr "Opções"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
+msgstr "Opções de montagem"
+
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr "Opções de montagem"
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
@@ -492,7 +530,7 @@ msgstr ""
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr ""
 
@@ -544,8 +582,8 @@ msgid "Edit configuration"
 msgstr ""
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -618,6 +656,10 @@ msgstr "Ganchos"
 msgid "Task"
 msgstr "Tarefa"
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr ""
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr ""
@@ -716,24 +758,32 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr "Tabela de partição"
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr "Tabela de partição FAI"
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr ""
 
diff --git a/fai/locale/ru/fusiondirectory.po b/fai/locale/ru/fusiondirectory.po
index ab4ddd99260931958c18d4e583692a27cf57dfc0..9adee84f67b2306ca3a8c09f4cfbfa88bff37b86 100644
--- a/fai/locale/ru/fusiondirectory.po
+++ b/fai/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -30,14 +30,14 @@ msgstr ""
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr "Свойства"
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr ""
 
@@ -47,20 +47,20 @@ msgid "Variables class name"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr "Описание"
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr ""
 
@@ -75,7 +75,7 @@ msgstr ""
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -101,93 +101,97 @@ msgid "The content of the variable"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr ""
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr "Ошибка"
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr "Обозначение"
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -265,7 +269,7 @@ msgstr ""
 msgid "FAI partition entry"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr ""
 
@@ -277,12 +281,12 @@ msgstr "Тип"
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr ""
 
@@ -310,147 +314,181 @@ msgstr ""
 msgid "Spare"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr "Пароль"
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr "Переустановить"
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point"
 msgstr "Точка монтирования"
 
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr "Параметры"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr "Создать параметры"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
@@ -492,7 +530,7 @@ msgstr ""
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr ""
 
@@ -544,8 +582,8 @@ msgid "Edit configuration"
 msgstr ""
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -618,6 +656,10 @@ msgstr "Хуки"
 msgid "Task"
 msgstr ""
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr ""
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr ""
@@ -716,24 +758,32 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr ""
 
diff --git a/fai/locale/ru@petr1708/fusiondirectory.po b/fai/locale/ru@petr1708/fusiondirectory.po
index 217ea7dd27026215686bed693c423e8a0f2e728a..d70a956a0d57f89babc3a526f3bf955bf3636fdc 100644
--- a/fai/locale/ru@petr1708/fusiondirectory.po
+++ b/fai/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -29,14 +29,14 @@ msgstr ""
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr ""
 
@@ -46,20 +46,20 @@ msgid "Variables class name"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr ""
 
@@ -74,7 +74,7 @@ msgstr ""
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -100,93 +100,97 @@ msgid "The content of the variable"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr ""
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -264,7 +268,7 @@ msgstr ""
 msgid "FAI partition entry"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr ""
 
@@ -276,12 +280,12 @@ msgstr ""
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr ""
 
@@ -309,147 +313,181 @@ msgstr ""
 msgid "Spare"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point"
+#: admin/fai/class_faiPartition.inc:331
+msgid "Options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point for this partition"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:327
-msgid "Options"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
@@ -491,7 +529,7 @@ msgstr ""
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr ""
 
@@ -543,8 +581,8 @@ msgid "Edit configuration"
 msgstr ""
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -617,6 +655,10 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr ""
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr ""
@@ -715,24 +757,32 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr ""
 
diff --git a/fai/locale/sv/fusiondirectory.po b/fai/locale/sv/fusiondirectory.po
index 23632e1fd8119763e103e4a131ff3cebb9797143..abed31ced9e7fd54842fa4f3b132f24b57de3fad 100644
--- a/fai/locale/sv/fusiondirectory.po
+++ b/fai/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -30,14 +30,14 @@ msgstr "FAI-variabel"
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr "Egenskaper"
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr "Klassnamn"
 
@@ -47,20 +47,20 @@ msgid "Variables class name"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr "Beskrivning"
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr ""
 
@@ -75,7 +75,7 @@ msgstr ""
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -101,93 +101,97 @@ msgid "The content of the variable"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr "krypterad"
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr "bootbar"
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr "bevara"
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr "Fel"
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr "Partitionstabellspost"
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr "FAI-partitionstabellspost"
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr "Enhet"
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr "fstab-nyckel"
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr "Etikett"
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr "Disketikett"
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr "Partitionsposter"
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr "Kombinerade fysiska partitioner"
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -265,7 +269,7 @@ msgstr ""
 msgid "FAI partition entry"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr "Partitionera"
 
@@ -277,12 +281,12 @@ msgstr "Typ"
 msgid "Partition type"
 msgstr "Partitionstyp"
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr "Primär"
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr "Logisk"
 
@@ -310,147 +314,181 @@ msgstr ""
 msgid "Spare"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr "Lösenord"
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr "Ändra storlek på existerande partition"
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr "Bootbar"
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr "Bevara"
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr "Filsystem"
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
-msgstr "växlingsutrymme"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
+msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr "ext2"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr "ext3"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr "ext4"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr "reiser fs"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr "xfs"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr "btrfs"
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
-msgstr "Krypterad"
-
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point"
 msgstr "Monteringspunkt"
 
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr "Alternativ"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
+msgstr "Monteringsalternativ"
+
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr "Alternativ för skapa filsystem"
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr "Tune-inställningar"
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr "Monteringsalternativ"
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr "RAID 0"
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr "RAID 1"
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr "RAID 5"
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr "RAID 6"
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr "Raid-arrayer måste innehålla minst två partitioner!"
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
@@ -493,7 +531,7 @@ msgstr "FAI-profil"
 msgid "FAI Profile"
 msgstr "FAI-profil"
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr ""
 
@@ -545,8 +583,8 @@ msgid "Edit configuration"
 msgstr ""
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -619,6 +657,10 @@ msgstr "Hooks"
 msgid "Task"
 msgstr "Åtgärd"
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr ""
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr ""
@@ -717,24 +759,32 @@ msgstr "Tillgång"
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:115
 msgid "Add RAID"
 msgstr "Lägg till RAID"
 
-#: admin/fai/class_faiPartitionTable.inc:115
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr "Partitionstabell"
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr "FAI-partitionstabell"
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr "Diskar"
 
diff --git a/fai/locale/tr_TR/fusiondirectory.po b/fai/locale/tr_TR/fusiondirectory.po
index c3299cf0a8046b98f9d1b249abc38c86b071cb8d..346810854b170e68f524c074e6410b6baa781e8f 100644
--- a/fai/locale/tr_TR/fusiondirectory.po
+++ b/fai/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
@@ -29,14 +29,14 @@ msgstr ""
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr ""
 
@@ -46,20 +46,20 @@ msgid "Variables class name"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr ""
 
@@ -74,7 +74,7 @@ msgstr ""
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -100,93 +100,97 @@ msgid "The content of the variable"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr ""
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -264,7 +268,7 @@ msgstr ""
 msgid "FAI partition entry"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr ""
 
@@ -276,12 +280,12 @@ msgstr ""
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr ""
 
@@ -309,147 +313,181 @@ msgstr ""
 msgid "Spare"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point"
+#: admin/fai/class_faiPartition.inc:331
+msgid "Options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point for this partition"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:327
-msgid "Options"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
@@ -491,7 +529,7 @@ msgstr ""
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr ""
 
@@ -543,8 +581,8 @@ msgid "Edit configuration"
 msgstr ""
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -617,6 +655,10 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr ""
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr ""
@@ -715,24 +757,32 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr ""
 
diff --git a/fai/locale/ug/fusiondirectory.po b/fai/locale/ug/fusiondirectory.po
index 9ce514a9ef8e240d0149f6c578e733994e214a4b..dff1dff977778e49d81b8d709fcf80d0c01046ca 100644
--- a/fai/locale/ug/fusiondirectory.po
+++ b/fai/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -29,14 +29,14 @@ msgstr ""
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr ""
 
@@ -46,20 +46,20 @@ msgid "Variables class name"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr ""
 
@@ -74,7 +74,7 @@ msgstr ""
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -100,93 +100,97 @@ msgid "The content of the variable"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr ""
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -264,7 +268,7 @@ msgstr ""
 msgid "FAI partition entry"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr ""
 
@@ -276,12 +280,12 @@ msgstr ""
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr ""
 
@@ -309,147 +313,181 @@ msgstr ""
 msgid "Spare"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point"
+#: admin/fai/class_faiPartition.inc:331
+msgid "Options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point for this partition"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:327
-msgid "Options"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
@@ -491,7 +529,7 @@ msgstr ""
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr ""
 
@@ -543,8 +581,8 @@ msgid "Edit configuration"
 msgstr ""
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -617,6 +655,10 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr ""
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr ""
@@ -715,24 +757,32 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr ""
 
diff --git a/fai/locale/vi_VN/fusiondirectory.po b/fai/locale/vi_VN/fusiondirectory.po
index e4d805ece12277357105a62fa802a673b605d903..b2a060020be1d31f4a15367eb915038fdc5c1b9e 100644
--- a/fai/locale/vi_VN/fusiondirectory.po
+++ b/fai/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -30,14 +30,14 @@ msgstr ""
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr "Properties"
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr ""
 
@@ -47,20 +47,20 @@ msgid "Variables class name"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr "Mô tả"
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr ""
 
@@ -75,7 +75,7 @@ msgstr ""
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -101,93 +101,97 @@ msgid "The content of the variable"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr ""
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr "Lá»—i"
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -265,7 +269,7 @@ msgstr ""
 msgid "FAI partition entry"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr ""
 
@@ -277,12 +281,12 @@ msgstr "Loại"
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr ""
 
@@ -310,147 +314,181 @@ msgstr ""
 msgid "Spare"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr "Mật khẩu"
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point"
+#: admin/fai/class_faiPartition.inc:331
+msgid "Options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:321
-msgid "Mount point for this partition"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:327
-msgid "Options"
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
@@ -492,7 +530,7 @@ msgstr ""
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr ""
 
@@ -544,8 +582,8 @@ msgid "Edit configuration"
 msgstr ""
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -618,6 +656,10 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr ""
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr ""
@@ -716,24 +758,32 @@ msgstr ""
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr ""
 
diff --git a/fai/locale/zh/fusiondirectory.po b/fai/locale/zh/fusiondirectory.po
index 8e490901fecef5121d135c58a1e16682fe412ee3..fe415adbc1fbb97b331521c0896ef8f8ff44abd8 100644
--- a/fai/locale/zh/fusiondirectory.po
+++ b/fai/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -30,14 +30,14 @@ msgstr ""
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
 #: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiTemplateEntry.inc:139
-#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiPartitionTable.inc:331
 msgid "Properties"
 msgstr "属性"
 
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 #: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
 #: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
-#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:334
 msgid "Class name"
 msgstr "类名"
 
@@ -47,20 +47,20 @@ msgid "Variables class name"
 msgstr ""
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 #: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
 #: admin/fai/class_faiTemplate.inc:173
 #: admin/fai/class_faiTemplateEntry.inc:146
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Description"
 msgstr "描述"
 
 #: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
 #: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
 #: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:338
 msgid "Short description of the class"
 msgstr ""
 
@@ -75,7 +75,7 @@ msgstr ""
 
 #: admin/fai/class_faiVariable.inc:69
 #: admin/fai/class_faiSimplePluginClass.inc:51
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 #: admin/fai/packageSelect/selectPackage-list.xml:40
 #: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
 #: admin/fai/class_faiHook.inc:69
@@ -101,93 +101,97 @@ msgid "The content of the variable"
 msgstr ""
 
 #: admin/fai/class_faiDiskEntry.inc:101
-msgid "encrypted"
-msgstr ""
-
-#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:107
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:145 admin/systems/class_faiLogView.inc:204
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
 #: admin/systems/class_faiLogView.inc:239
 msgid "Error"
 msgstr "错误"
 
-#: admin/fai/class_faiDiskEntry.inc:146
+#: admin/fai/class_faiDiskEntry.inc:147
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:218
+#: admin/fai/class_faiDiskEntry.inc:226
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:219
+#: admin/fai/class_faiDiskEntry.inc:227
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
 msgid "Device"
 msgstr "设备"
 
-#: admin/fai/class_faiDiskEntry.inc:233
+#: admin/fai/class_faiDiskEntry.inc:241
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:243
+#: admin/fai/class_faiDiskEntry.inc:251
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:246
+#: admin/fai/class_faiDiskEntry.inc:254
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:249
+#: admin/fai/class_faiDiskEntry.inc:257
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:258
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
 msgid "Partition entries"
 msgstr "分区条目"
 
-#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:263
+#: admin/fai/class_faiDiskEntry.inc:275
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:269
-#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
 msgid "Partitions in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:538
+#: admin/fai/class_faiDiskEntry.inc:579
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:542
+#: admin/fai/class_faiDiskEntry.inc:583
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -265,7 +269,7 @@ msgstr ""
 msgid "FAI partition entry"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:229
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
 msgid "Partition"
 msgstr ""
 
@@ -277,12 +281,12 @@ msgstr "类型"
 msgid "Partition type"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
 msgid "Primary"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
-#: admin/fai/class_faiPartition.inc:375
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
 msgid "Logical"
 msgstr ""
 
@@ -310,147 +314,181 @@ msgstr ""
 msgid "Spare"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:275
 msgid "Missing"
 msgstr ""
 
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr ""
+
 #: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr "口令"
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:292
+#: admin/fai/class_faiPartition.inc:300
 msgid "Resize existing partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Bootable"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:296
+#: admin/fai/class_faiPartition.inc:304
 msgid "Wether or not this partition can be booted"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:300
+#: admin/fai/class_faiPartition.inc:308
 msgid "Preserve"
 msgstr "保留"
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
 msgid "Never"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Always"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:303
+#: admin/fai/class_faiPartition.inc:311
 msgid "Reinstall"
 msgstr "重新安装"
 
-#: admin/fai/class_faiPartition.inc:308 admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
 msgid "Filesystem"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:311
+#: admin/fai/class_faiPartition.inc:319
 msgid "The filesystem this partition should be formatted with"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
-msgid "swap space"
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext2"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext3"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "ext4"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "reiser fs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "xfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "btrfs"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:314
+#: admin/fai/class_faiPartition.inc:322
 msgid "LVM/RAID"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:317
-msgid "Encrypted"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:317
-msgid "Wether or not this partition is encrypted"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point"
 msgstr "挂载点"
 
-#: admin/fai/class_faiPartition.inc:321
+#: admin/fai/class_faiPartition.inc:325
 msgid "Mount point for this partition"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:327
+#: admin/fai/class_faiPartition.inc:331
 msgid "Options"
 msgstr "选项"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
+msgstr "挂载选项"
+
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:339
 msgid "Create options"
 msgstr "创建选项"
 
-#: admin/fai/class_faiPartition.inc:330
+#: admin/fai/class_faiPartition.inc:339
 msgid "Filesystem create options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:334
+#: admin/fai/class_faiPartition.inc:343
 msgid "Filesystem tune options"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:338
-msgid "Mount options"
-msgstr "挂载选项"
-
-#: admin/fai/class_faiPartition.inc:338
-msgid "Filesystem mount options"
-msgstr ""
-
-#: admin/fai/class_faiPartition.inc:380
+#: admin/fai/class_faiPartition.inc:385
 msgid "RAID 0"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:381
+#: admin/fai/class_faiPartition.inc:386
 msgid "RAID 1"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:382
+#: admin/fai/class_faiPartition.inc:387
 msgid "RAID 5"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:383
+#: admin/fai/class_faiPartition.inc:388
 msgid "RAID 6"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:478
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
 msgid "Raid arrays must contain at least two partitions!"
 msgstr ""
 
-#: admin/fai/class_faiPartition.inc:480
+#: admin/fai/class_faiPartition.inc:510
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr ""
@@ -492,7 +530,7 @@ msgstr ""
 msgid "FAI Profile"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
 msgid "Partition table class name"
 msgstr ""
 
@@ -544,8 +582,8 @@ msgid "Edit configuration"
 msgstr ""
 
 #: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
-#: admin/fai/class_faiPartitionTable.inc:215
-#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
 #: admin/systems/services/repository/class_serviceRepository.inc:240
 #: admin/systems/services/repository/class_serviceRepository.inc:257
 #: admin/systems/services/repository/class_serviceRepository.inc:261
@@ -618,6 +656,10 @@ msgstr "钩子"
 msgid "Task"
 msgstr "任务"
 
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr ""
+
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr ""
@@ -716,24 +758,32 @@ msgstr "访问"
 msgid "Access rights"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:111
-msgid "Add RAID"
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
 msgstr ""
 
 #: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:123
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:289
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
 msgid "Partition table"
 msgstr "分区表"
 
-#: admin/fai/class_faiPartitionTable.inc:290
-#: admin/fai/class_faiPartitionTable.inc:293
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
 msgid "FAI partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:322
+#: admin/fai/class_faiPartitionTable.inc:344
 msgid "Discs"
 msgstr "Discs"
 
diff --git a/fai/locale/zh_TW/fusiondirectory.po b/fai/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..a57ce31d594517c726b98c05fe888f52ee1653ef
--- /dev/null
+++ b/fai/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,1021 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/fai/class_faiVariable.inc:28
+msgid "Variable"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:29 admin/fai/class_faiVariable.inc:32
+msgid "FAI variable"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:48 admin/fai/class_faiScript.inc:50
+#: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
+#: admin/fai/class_faiTemplateEntry.inc:139
+#: admin/fai/class_faiPartitionTable.inc:331
+msgid "Properties"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPackage.inc:399
+#: admin/fai/class_faiHook.inc:51 admin/fai/class_faiTemplate.inc:169
+#: admin/fai/class_faiPartitionTable.inc:334
+msgid "Class name"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+msgid "Variables class name"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiVariable.inc:73
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiScript.inc:57 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiHook.inc:73
+#: admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiTemplateEntry.inc:146
+#: admin/fai/class_faiPartitionTable.inc:338
+msgid "Description"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:55 admin/fai/class_faiScript.inc:57
+#: admin/fai/class_faiProfile.inc:56 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiHook.inc:55 admin/fai/class_faiTemplate.inc:173
+#: admin/fai/class_faiPartitionTable.inc:338
+msgid "Short description of the class"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:61
+msgid "Variables"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:65 admin/fai/class_faiScript.inc:67
+#: admin/fai/class_faiHook.inc:65
+msgid "Variables in this class"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:69
+#: admin/fai/class_faiSimplePluginClass.inc:51
+#: admin/fai/class_faiDiskEntry.inc:241
+#: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/class_faiPartition.inc:240 admin/fai/class_faiScript.inc:71
+#: admin/fai/class_faiHook.inc:69
+msgid "Name"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:69 admin/fai/class_faiScript.inc:71
+#: admin/fai/class_faiHook.inc:69
+msgid "The name of the variable"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:73 admin/fai/class_faiScript.inc:75
+#: admin/fai/class_faiHook.inc:73
+msgid "A short description of the variable"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:77
+msgid "Content"
+msgstr ""
+
+#: admin/fai/class_faiVariable.inc:77
+msgid "The content of the variable"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:101
+msgid "bootable"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:104
+msgid "preserve"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:146 admin/systems/class_faiLogView.inc:204
+#: admin/systems/class_faiLogView.inc:239
+msgid "Error"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:147
+#, php-format
+msgid ""
+"The partition cannot be deleted while it is used in the \"%s\" disk "
+"definition!"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:226
+msgid "Partition table entry"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:227
+msgid "FAI partition table entry"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:238 admin/fai/class_faiDiskEntry.inc:254
+msgid "Device"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:241
+msgid "Disk name"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:247 admin/fai/class_faiPartition.inc:246
+msgid "Short description"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:251
+msgid "fstab key"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:251
+msgid "Key to use in fstab file"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:254
+msgid "Label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:254
+msgid "UUID"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:257
+msgid "Disk label"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Random init"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:263
+msgid "Initialise all encrypted partitions with random data"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:270
+msgid "Partition entries"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:275 admin/fai/class_faiPartition.inc:452
+msgid "Combined physical partitions"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:275
+msgid "Physical partitions combined in this LVM volume"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:281
+#: admin/fai/class_faiPartitionTable.inc:351
+msgid "Partitions in this class"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:579
+msgid ""
+"You have more than four primary partition table entries in your "
+"configuration"
+msgstr ""
+
+#: admin/fai/class_faiDiskEntry.inc:583
+msgid ""
+"You cannot have more than three primary partition while using logical "
+"partitions"
+msgstr ""
+
+#: admin/fai/packageSelect/selectPackage-list.xml:11
+msgid "Please select the desired entries"
+msgstr ""
+
+#: admin/fai/packageSelect/selectPackage-list.xml:15
+#: admin/fai/class_faiPackage.inc:376
+msgid "Package"
+msgstr ""
+
+#: admin/fai/packageSelect/selectPackage-list.xml:48
+msgid "Version"
+msgstr ""
+
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:41
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:46
+#: admin/fai/class_faiPackageConfiguration.inc:59
+#: admin/fai/class_faiPackage.inc:287
+msgid "Infrastructure service"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:30
+msgid "Type of sizing - fixed, dynamic or all remaining space"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:33
+msgid "Fixed"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:33
+msgid "Dynamic"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:33
+msgid "Remaining space"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:44 admin/fai/class_faiPartition.inc:55
+msgid "KB"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:44 admin/fai/class_faiPartition.inc:55
+msgid "MB"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:44 admin/fai/class_faiPartition.inc:55
+msgid "GB"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:44 admin/fai/class_faiPartition.inc:55
+msgid "TB"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:44 admin/fai/class_faiPartition.inc:55
+msgid "PB"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:144
+msgid "Minimum partition size"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:144
+msgid "Maximum partition size"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:217
+msgid "Partition entry"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:218
+msgid "FAI partition entry"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:229 admin/fai/class_faiPartition.inc:292
+msgid "Partition"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:234
+msgid "Type"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:234
+msgid "Partition type"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:379
+msgid "Primary"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:376
+#: admin/fai/class_faiPartition.inc:380
+msgid "Logical"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:240
+msgid "Partition name"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:250
+msgid "Size"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:250
+msgid "Size of this partition"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:256
+msgid "Flags"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:265
+msgid "Combined physical partitions in this RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:269
+msgid "Spare Raid device"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:275
+msgid "Missing Raid device"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:292
+msgid "Partition to encrypt"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid "Password"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:296
+msgid ""
+"Password to use for encryption. Leave empty to use a encryption key file "
+"instead."
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
+msgid "Resize"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:300
+msgid "Resize existing partition"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:304
+msgid "Bootable"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:304
+msgid "Wether or not this partition can be booted"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:308
+msgid "Preserve"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:308
+msgid "Does the partition need to be preserved"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
+msgid "Never"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
+msgid "Always"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:311
+msgid "Reinstall"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:316 admin/fai/class_faiPartition.inc:319
+msgid "Filesystem"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:319
+msgid "The filesystem this partition should be formatted with"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:322
+msgid "swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:322
+msgid "ext2"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:322
+msgid "ext3"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:322
+msgid "ext4"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:322
+msgid "reiser fs"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:322
+msgid "xfs"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:322
+msgid "btrfs"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:322
+msgid "LVM/RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:325
+msgid "Mount point for this partition"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:331
+msgid "Options"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:334
+msgid "Mount options"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:334
+msgid "Filesystem mount options"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:339
+msgid "Create options"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:339
+msgid "Filesystem create options"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:343
+msgid "Tune options"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:343
+msgid "Filesystem tune options"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:385
+msgid "RAID 0"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:386
+msgid "RAID 1"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:387
+msgid "RAID 5"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:388
+msgid "RAID 6"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:392
+msgid "LUKS"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:393
+msgid "Swap"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:394
+msgid "tmp"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:434
+msgid "Encryption settings"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:508
+msgid "Raid arrays must contain at least two partitions!"
+msgstr ""
+
+#: admin/fai/class_faiPartition.inc:510
+msgid ""
+"Raid 0 arrays can only be realized with a combination of two partitions!"
+msgstr ""
+
+#: admin/fai/class_faiScript.inc:30 admin/fai/class_faiScript.inc:84
+#: admin/fai/class_faiHook.inc:85
+msgid "Script"
+msgstr ""
+
+#: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
+msgid "FAI script"
+msgstr ""
+
+#: admin/fai/class_faiScript.inc:63
+msgid "Scripts"
+msgstr ""
+
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority"
+msgstr ""
+
+#: admin/fai/class_faiScript.inc:79
+msgid "Priority of this script (smaller is done first)"
+msgstr ""
+
+#: admin/fai/class_faiScript.inc:84
+msgid "The script itself"
+msgstr ""
+
+#: admin/fai/class_faiProfile.inc:30
+msgid "Profile"
+msgstr ""
+
+#: admin/fai/class_faiProfile.inc:31
+msgid "FAI profile"
+msgstr ""
+
+#: admin/fai/class_faiProfile.inc:34
+msgid "FAI Profile"
+msgstr ""
+
+#: admin/fai/class_faiProfile.inc:52 admin/fai/class_faiPartitionTable.inc:334
+msgid "Partition table class name"
+msgstr ""
+
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes"
+msgstr ""
+
+#: admin/fai/class_faiProfile.inc:63
+msgid "FAI classes which are part of this profile"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:33
+#: admin/fai/class_faiPackageConfiguration.inc:36
+msgid "FAI package configuration"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:34
+msgid "Configure debconf options of a package"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:80
+#, php-format
+msgid "Debconf information for package \"%s\""
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:172
+msgid "Warning"
+msgstr ""
+
+#: admin/fai/class_faiPackageConfiguration.inc:173
+#, php-format
+msgid ""
+"The debconf questions \"%s\" are dynamically generated during package "
+"installation and requires choosing between specific options which cannot be "
+"presented here. The entered text needs to be one of the valid choices in "
+"order to take effect."
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:163
+msgid "Mark for installation"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:167
+msgid "Mark for removal"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:172
+msgid "Edit configuration"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
+#: admin/fai/class_faiPartitionTable.inc:239
+#: admin/fai/class_faiPartitionTable.inc:280
+#: admin/systems/services/repository/class_serviceRepository.inc:240
+#: admin/systems/services/repository/class_serviceRepository.inc:257
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+msgid "LDAP error"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:306
+msgid "Unkown packages"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:377
+msgid "FAI Package list"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:380
+msgid "FAI Package"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:409 admin/systems/class_faiStartup.inc:103
+msgid "Repository"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:412 admin/systems/class_faiStartup.inc:91
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+msgid "Release"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:412
+msgid "Debian release concerned"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:416
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+msgid "Sections"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:416
+msgid "Sections concerned"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:420
+msgid "Install method"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:420
+msgid "Install method to use for this package list"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:431
+msgid "Packages"
+msgstr ""
+
+#: admin/fai/class_faiPackage.inc:435
+msgid "Packages in this class"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:28
+msgid "Hook"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:29 admin/fai/class_faiHook.inc:32
+msgid "FAI hook"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:61
+msgid "Hooks"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:77
+msgid "Task"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:77
+msgid "Task to run"
+msgstr ""
+
+#: admin/fai/class_faiHook.inc:85
+msgid "The script of this hook"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:131
+#, php-format
+msgid "There are several files with the same path: %s"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:146
+msgid "Template"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
+msgid "FAI template"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:169
+msgid "Template class name"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:179
+msgid "Template files"
+msgstr ""
+
+#: admin/fai/class_faiTemplate.inc:183
+msgid "Template files in this class"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
+#: admin/systems/class_faiStartup.inc:64 config/fai/class_faiConfig.inc:41
+msgid "FAI"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:118
+msgid "Manage FAI software packages and deployment recipes"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:138
+msgid "There are no FAI branches"
+msgstr ""
+
+#: admin/fai/class_faiManagement.inc:141
+msgid " Please add at least one repository service to create those."
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:142
+msgid "File path"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:142
+msgid "Complete absolute template file path and name"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:146
+msgid "Short description of the file"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:155
+msgid "Template attributes"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:159
+msgid "Template file content"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:159
+msgid "Content of the template file"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:163
+msgid "Owner and group of the file"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:166
+msgid "Owner"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:166
+msgid "File owner"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:171
+msgid "Group"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:171
+msgid "File group"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:180
+msgid "Access"
+msgstr ""
+
+#: admin/fai/class_faiTemplateEntry.inc:180
+msgid "Access rights"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:108
+msgid "Add disk"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:115
+msgid "Add RAID"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:123
+msgid "Add LVM"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:131
+msgid "Add cryptsetup"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:311
+msgid "Partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:312
+#: admin/fai/class_faiPartitionTable.inc:315
+msgid "FAI partition table"
+msgstr ""
+
+#: admin/fai/class_faiPartitionTable.inc:344
+msgid "Discs"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:57
+msgid "Sort down"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:59
+msgid "Sort up"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:71
+msgid "File"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:72
+msgid "Date"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:151
+#: admin/systems/class_faiLogView.inc:154
+msgid "Available logs"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:159
+msgid "Selected log"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:163
+msgid "Content of the selected log"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:175
+msgid "FAI Logs"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:176
+msgid "FAI Logs Viewer"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:219
+msgid "Selected file"
+msgstr ""
+
+#: admin/systems/class_faiLogView.inc:227
+#, php-format
+msgid "Selected file: %s"
+msgstr ""
+
+#: admin/systems/class_faiStartup.inc:65
+msgid "Full automated installation"
+msgstr ""
+
+#: admin/systems/class_faiStartup.inc:83
+msgid "FAI settings"
+msgstr ""
+
+#: admin/systems/class_faiStartup.inc:87
+msgid "FAI profil and release to be applied to this computer"
+msgstr ""
+
+#: admin/systems/class_faiStartup.inc:91
+msgid "FAI debian release to be installed on this computer"
+msgstr ""
+
+#: admin/systems/class_faiStartup.inc:95
+msgid "Profil"
+msgstr ""
+
+#: admin/systems/class_faiStartup.inc:95
+msgid "FAI profil to be applied to this computer"
+msgstr ""
+
+#: admin/systems/class_faiStartup.inc:103
+msgid "FAI Debian repository to be used for installation"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "URL"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:31
+msgid "Repository url"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent server"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:35
+msgid "Parent repository server"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:40
+msgid "Release used on this repository"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:47
+msgid "Sections available on this repository"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid "Mirror mode"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:52
+msgid ""
+"Is this mirror an installation repository? Is its release a custom one?"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Local mirror"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:57
+msgid "Is this mirror a local or a network mirror?"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Architectures"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:66
+msgid "Processor architectures available on this repository"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Distribution"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:72
+msgid "Which distribution is this repository for"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "Path pattern"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:77
+msgid "How this repository is organized (only for RPM repositories)"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:160
+msgid "Package repository"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:161
+msgid "Package repository information"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:173
+msgid "Repositories"
+msgstr ""
+
+#: admin/systems/services/repository/class_serviceRepository.inc:178
+msgid "Repositories this server hosts"
+msgstr ""
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
+msgid "Argonaut FAI monitor"
+msgstr ""
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:29
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:40
+msgid "Argonaut FAI monitor settings"
+msgstr ""
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "Port"
+msgstr ""
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
+msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
+msgstr ""
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "Timeout"
+msgstr ""
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
+msgid "The timeout for bad clients. 0 to disable."
+msgstr ""
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "CA certificate"
+msgstr ""
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
+msgid "Path to the CA certificate file on Argonaut FAI monitor server"
+msgstr ""
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Log directory"
+msgstr ""
+
+#: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
+msgid "Directory in which argonaut-fai-monitor will store its log"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:28
+msgid "FAI configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:29
+msgid "FusionDirectory fai plugin configuration"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:44
+msgid "Fai base RDN"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:44
+msgid "Branch in which fai branches will be stored"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:59
+#, php-format
+msgid "Fai %s RDN"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:60
+#, php-format
+msgid "Relative branch in which fai %s will be stored"
+msgstr ""
+
+#: config/fai/class_faiConfig.inc:60
+msgid "s"
+msgstr ""
+
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
+msgid "Filter"
+msgstr ""
+
+#: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
+msgid "A maximum of 200 entries will be shown here."
+msgstr ""
diff --git a/freeradius/locale/af_ZA/fusiondirectory.po b/freeradius/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..cd4fe62951880e1dee7e42fb3fce453bdc35b401
--- /dev/null
+++ b/freeradius/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,120 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/freeradius/class_freeradiusGroup.inc:34
+#: personal/freeradius/class_freeradiusAccount.inc:35
+msgid "Freeradius"
+msgstr ""
+
+#: admin/freeradius/class_freeradiusGroup.inc:35
+#: personal/freeradius/class_freeradiusAccount.inc:36
+msgid "This Plugin is for Radius accounting based in FreeRadius"
+msgstr ""
+
+#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:55
+msgid "Support 802.1x"
+msgstr ""
+
+#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+msgid "Tunnel medium type"
+msgstr ""
+
+#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:58
+msgid "Name of the tunnel medium type"
+msgstr ""
+
+#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+msgid "Tunnel type"
+msgstr ""
+
+#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:63
+msgid "Name of the tunnel type"
+msgstr ""
+
+#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+msgid "VLAN id"
+msgstr ""
+
+#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:68
+msgid "VLAN identifier"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:73
+msgid "Expiration date"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:73
+msgid "Date of the expiration account"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
+msgid "Groups"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:85
+msgid "FreeRadius Group"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:94
+msgid "User preferences"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:97
+msgid "Protocol"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:102
+msgid "IP Address"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:107
+msgid "IP Netmask"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:112
+msgid "Framed-MTU"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:119
+msgid "Compression"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:124
+msgid "Service type"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:129
+msgid "Session Timeout"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:136
+msgid "Idle Timeout"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:143
+msgid "Port limit"
+msgstr ""
diff --git a/freeradius/locale/ar/fusiondirectory.po b/freeradius/locale/ar/fusiondirectory.po
index 330bb034a13f42ace2b3fda94b41f8a5f712555c..91ea72b99fb922c430e3712a105b2ff281c4c55a 100644
--- a/freeradius/locale/ar/fusiondirectory.po
+++ b/freeradius/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/freeradius/locale/ca/fusiondirectory.po b/freeradius/locale/ca/fusiondirectory.po
index 6c388096272358f40ccbba51df45abf9e0068fe5..eb89e604addfdb567a5f0848a57097617c626de2 100644
--- a/freeradius/locale/ca/fusiondirectory.po
+++ b/freeradius/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/freeradius/locale/cs_CZ/fusiondirectory.po b/freeradius/locale/cs_CZ/fusiondirectory.po
index 859cdc70bd809512ef9f7df39d0f5a1257285180..ae0b6e65272cda11750eadb60ac8da0ea30ebe45 100644
--- a/freeradius/locale/cs_CZ/fusiondirectory.po
+++ b/freeradius/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
diff --git a/freeradius/locale/de/fusiondirectory.po b/freeradius/locale/de/fusiondirectory.po
index 572964af3af46cd6bbb596837443c85279d755ab..1067dd281915d199ddd7dbe0a1a6fd4578c411c3 100644
--- a/freeradius/locale/de/fusiondirectory.po
+++ b/freeradius/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/freeradius/locale/el_GR/fusiondirectory.po b/freeradius/locale/el_GR/fusiondirectory.po
index b9589b890b85d6dabb6df349ed0bc2851acb7fee..c5f8ea43e6f0d440d9bc1132f693b3a8c4f60ba7 100644
--- a/freeradius/locale/el_GR/fusiondirectory.po
+++ b/freeradius/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/freeradius/locale/es/fusiondirectory.po b/freeradius/locale/es/fusiondirectory.po
index 1adb02801255f06ac8cd8d9ea453e1d9b548621e..eacd2401d274134194eb31f9a9ec753ddfa79f17 100644
--- a/freeradius/locale/es/fusiondirectory.po
+++ b/freeradius/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/freeradius/locale/es_CO/fusiondirectory.po b/freeradius/locale/es_CO/fusiondirectory.po
index 979bd25d2c54d0894122e7e3b8666fe110f45e1e..6b4ad557117f766cc5ce041bca9952c615ecf8ae 100644
--- a/freeradius/locale/es_CO/fusiondirectory.po
+++ b/freeradius/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/freeradius/locale/es_VE/fusiondirectory.po b/freeradius/locale/es_VE/fusiondirectory.po
index 22bb494adaec11343e0aad6ca3eb6138badaef0c..d10ec1b5a587520834a2618ed5c2f388d3cb4b87 100644
--- a/freeradius/locale/es_VE/fusiondirectory.po
+++ b/freeradius/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/freeradius/locale/fa_IR/fusiondirectory.po b/freeradius/locale/fa_IR/fusiondirectory.po
index 820738ebb1fe577c355441f01251ed973b500073..0bdb4852775353dec0e5a040fff4d99539ad7873 100644
--- a/freeradius/locale/fa_IR/fusiondirectory.po
+++ b/freeradius/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/freeradius/class_freeradiusGroup.inc:34
 #: personal/freeradius/class_freeradiusAccount.inc:35
diff --git a/freeradius/locale/fi_FI/fusiondirectory.po b/freeradius/locale/fi_FI/fusiondirectory.po
index 65b1685aca2c4d6ddc8665e1ed516a633bdf86d2..9e7fa4bea4147bfdc03c61c0d2f1e881d8ab2ea3 100644
--- a/freeradius/locale/fi_FI/fusiondirectory.po
+++ b/freeradius/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/freeradius/locale/fr/fusiondirectory.po b/freeradius/locale/fr/fusiondirectory.po
index 772d7787f7131a8b2c30c4c3a2536f1de767d1f1..2ff674652ef6eaefae4d40cc911cffa91215da76 100644
--- a/freeradius/locale/fr/fusiondirectory.po
+++ b/freeradius/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/freeradius/locale/hu_HU/fusiondirectory.po b/freeradius/locale/hu_HU/fusiondirectory.po
index ee24f736345ced0db52ac6aa9d576177a81eb354..0ff26ef46b5e11b8569df6e9458d6b4cb66158d0 100644
--- a/freeradius/locale/hu_HU/fusiondirectory.po
+++ b/freeradius/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/freeradius/locale/id/fusiondirectory.po b/freeradius/locale/id/fusiondirectory.po
index 1ebc0978a305983e16d7547876c16f40717e64b2..6b7cab83899d7e92b5aa258136549a307ac2cb42 100644
--- a/freeradius/locale/id/fusiondirectory.po
+++ b/freeradius/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/freeradius/locale/it_IT/fusiondirectory.po b/freeradius/locale/it_IT/fusiondirectory.po
index 1a57c261d30dbb9e1eb52631e12dd68820b474b1..be9a54854fdc183c296a7a7dbc135c815d3894b9 100644
--- a/freeradius/locale/it_IT/fusiondirectory.po
+++ b/freeradius/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/freeradius/locale/ja/fusiondirectory.po b/freeradius/locale/ja/fusiondirectory.po
index 7f439b5396f5a2ac8774be36a978aeeeb6b346e0..298a63d17b14bc36b83e51da422b0febb6cf2638 100644
--- a/freeradius/locale/ja/fusiondirectory.po
+++ b/freeradius/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/freeradius/locale/ko/fusiondirectory.po b/freeradius/locale/ko/fusiondirectory.po
index d713d20306978f460047b49cfc4d86ad06ecb270..e43c641b3892f528a069c9541ba8d479f17995c4 100644
--- a/freeradius/locale/ko/fusiondirectory.po
+++ b/freeradius/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/freeradius/locale/lv/fusiondirectory.po b/freeradius/locale/lv/fusiondirectory.po
index 2b7b2fb645e91813f9a985d454f23a0580a3bd4d..bd673471274fa9770f1506afdca6203fd8830cd6 100644
--- a/freeradius/locale/lv/fusiondirectory.po
+++ b/freeradius/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/freeradius/locale/nb/fusiondirectory.po b/freeradius/locale/nb/fusiondirectory.po
index 9920bb84527faca31a0d391b3520bbe2377d70d4..2cd9b12ded3b86d94a588d55e98ed457005d90ed 100644
--- a/freeradius/locale/nb/fusiondirectory.po
+++ b/freeradius/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/freeradius/locale/nl/fusiondirectory.po b/freeradius/locale/nl/fusiondirectory.po
index 771c8f98b125e17f3711911ccdd80096ac2a592c..1b8be922e03130a2b04f01267637635385463e3b 100644
--- a/freeradius/locale/nl/fusiondirectory.po
+++ b/freeradius/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/freeradius/locale/pl/fusiondirectory.po b/freeradius/locale/pl/fusiondirectory.po
index 71b0f3262d9ca012d746bf113ac6d393a0edb5c1..aaa8d5a136f974f0bd2c25b24879fc48c13e6c0b 100644
--- a/freeradius/locale/pl/fusiondirectory.po
+++ b/freeradius/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/freeradius/locale/pt/fusiondirectory.po b/freeradius/locale/pt/fusiondirectory.po
index 863f9cc1e8b0d610a2ffb548109914f32e0eafe4..58c62556fdceb16ea5f16d55b6a6389a215e5ec3 100644
--- a/freeradius/locale/pt/fusiondirectory.po
+++ b/freeradius/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/freeradius/locale/pt_BR/fusiondirectory.po b/freeradius/locale/pt_BR/fusiondirectory.po
index 617c849fd5370a0fd16753be41985497f1826c78..1a7dd2a0c4e69952cd345c5430d53a96dde71b15 100644
--- a/freeradius/locale/pt_BR/fusiondirectory.po
+++ b/freeradius/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/freeradius/locale/ru/fusiondirectory.po b/freeradius/locale/ru/fusiondirectory.po
index 6ce192a8eab154238e283c1a426e8c28a826b561..cf1d663ef32071c26e5af2ef30f4e52fcb24f7b1 100644
--- a/freeradius/locale/ru/fusiondirectory.po
+++ b/freeradius/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/freeradius/locale/ru@petr1708/fusiondirectory.po b/freeradius/locale/ru@petr1708/fusiondirectory.po
index ca433cd5ab6a5f229217137ccc5eec6a6e132c8a..700ac049b50d5be7b206227c3728c0f052deb961 100644
--- a/freeradius/locale/ru@petr1708/fusiondirectory.po
+++ b/freeradius/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/freeradius/locale/sv/fusiondirectory.po b/freeradius/locale/sv/fusiondirectory.po
index bd6ebe0eb0202ee5bf9532be07253420d7eded35..4b73c105a01daa7e58bba860858f5881d136ebf7 100644
--- a/freeradius/locale/sv/fusiondirectory.po
+++ b/freeradius/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/freeradius/locale/tr_TR/fusiondirectory.po b/freeradius/locale/tr_TR/fusiondirectory.po
index 5b06682a4c6ba88ebb452ea8190bb3a8e07fe99f..8f74d94045d8297bdd5c43230881f52caec36a73 100644
--- a/freeradius/locale/tr_TR/fusiondirectory.po
+++ b/freeradius/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/freeradius/locale/ug/fusiondirectory.po b/freeradius/locale/ug/fusiondirectory.po
index 6b2e5527ae0e5f0c188d17bdc33e1ce3656c9f7e..84104b5669706a5400147fe03841bfd35cb62869 100644
--- a/freeradius/locale/ug/fusiondirectory.po
+++ b/freeradius/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/freeradius/locale/vi_VN/fusiondirectory.po b/freeradius/locale/vi_VN/fusiondirectory.po
index 874238a7a5ccbc5b21cddfccfef6af70d8abe106..b848a85ac2a37b5db37f479e4c28da0248dc1963 100644
--- a/freeradius/locale/vi_VN/fusiondirectory.po
+++ b/freeradius/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/freeradius/locale/zh/fusiondirectory.po b/freeradius/locale/zh/fusiondirectory.po
index 83ded045842dfe23aa806ca22c5919202d6b250f..a21aa0d3d67d400269c220ceaf7ce6af703dd54c 100644
--- a/freeradius/locale/zh/fusiondirectory.po
+++ b/freeradius/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/freeradius/locale/zh_TW/fusiondirectory.po b/freeradius/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..e6e2b2901cf547eff77a234d5d694cc8e7abcb71
--- /dev/null
+++ b/freeradius/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,120 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/freeradius/class_freeradiusGroup.inc:34
+#: personal/freeradius/class_freeradiusAccount.inc:35
+msgid "Freeradius"
+msgstr ""
+
+#: admin/freeradius/class_freeradiusGroup.inc:35
+#: personal/freeradius/class_freeradiusAccount.inc:36
+msgid "This Plugin is for Radius accounting based in FreeRadius"
+msgstr ""
+
+#: admin/freeradius/class_freeradiusGroup.inc:49
+#: personal/freeradius/class_freeradiusAccount.inc:55
+msgid "Support 802.1x"
+msgstr ""
+
+#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+msgid "Tunnel medium type"
+msgstr ""
+
+#: admin/freeradius/class_freeradiusGroup.inc:53
+#: personal/freeradius/class_freeradiusAccount.inc:58
+msgid "Name of the tunnel medium type"
+msgstr ""
+
+#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+msgid "Tunnel type"
+msgstr ""
+
+#: admin/freeradius/class_freeradiusGroup.inc:60
+#: personal/freeradius/class_freeradiusAccount.inc:63
+msgid "Name of the tunnel type"
+msgstr ""
+
+#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+msgid "VLAN id"
+msgstr ""
+
+#: admin/freeradius/class_freeradiusGroup.inc:67
+#: personal/freeradius/class_freeradiusAccount.inc:68
+msgid "VLAN identifier"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:73
+msgid "Expiration date"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:73
+msgid "Date of the expiration account"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
+msgid "Groups"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:85
+msgid "FreeRadius Group"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:94
+msgid "User preferences"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:97
+msgid "Protocol"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:102
+msgid "IP Address"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:107
+msgid "IP Netmask"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:112
+msgid "Framed-MTU"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:119
+msgid "Compression"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:124
+msgid "Service type"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:129
+msgid "Session Timeout"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:136
+msgid "Idle Timeout"
+msgstr ""
+
+#: personal/freeradius/class_freeradiusAccount.inc:143
+msgid "Port limit"
+msgstr ""
diff --git a/fusioninventory/locale/af_ZA/fusiondirectory.po b/fusioninventory/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..c89df22684c93c1d2d2d7afbe892c37abe30fd9b
--- /dev/null
+++ b/fusioninventory/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,221 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/inventory/class_inventoryManagement.inc:36
+msgid "Inventory objects"
+msgstr ""
+
+#: admin/inventory/class_inventoryManagement.inc:37
+msgid "Browse inventory objects"
+msgstr ""
+
+#: admin/inventory/inventory-list.xml:7
+msgid "NO LABEL"
+msgstr ""
+
+#: admin/inventory/inventory-list.xml:28
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:56
+msgid "IP"
+msgstr ""
+
+#: admin/inventory/inventory-list.xml:36
+msgid "Macs"
+msgstr ""
+
+#: admin/inventory/inventory-list.xml:44
+msgid "Operating Systems"
+msgstr ""
+
+#: admin/inventory/inventory-list.xml:50
+msgid "Actions"
+msgstr ""
+
+#: admin/inventory/inventory-list.xml:61 admin/inventory/inventory-list.xml:85
+msgid "Edit"
+msgstr ""
+
+#: admin/inventory/inventory-list.xml:68 admin/inventory/inventory-list.xml:92
+msgid "Remove"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
+msgid "Configuration"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:33
+msgid "Server"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:33
+msgid "Server which FI will send inventory infos"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:37
+msgid "Delay time"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:37
+msgid "Maximum initial delay before first target, in seconds"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:42
+msgid "Wait"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:42
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:60
+msgid "Maximum delay between each targets, in seconds"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:49
+msgid "Web Interface"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:52
+msgid "Disable web interface"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:52
+msgid "Do not use web interface"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:56
+msgid "Network interface to listen to"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:60
+msgid "Port"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:65
+msgid "Trust"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:65
+msgid "IPs allowed to launch inventory task through web interface"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+#: config/fusioninventory/class_fiConfig.inc:41
+msgid "FusionInventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
+msgid "FusionInventory agent configuration"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
+msgid "Inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
+msgid "Inventory Viewer"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
+msgid "Inventory object"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
+msgid "System"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
+msgid "System entry matching this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
+msgid "Hardware"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
+msgid "Software"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
+msgid "Users"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
+msgid "Processes"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
+msgid "Create a system based on this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
+msgid "Create"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
+msgid "No matching system"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Branch in which inventory objects will be stored"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Inventory matching"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Criteria to link an inventory result to a system"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Mac address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr ""
+
+#: html/collect.php:83
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr ""
diff --git a/fusioninventory/locale/ar/fusiondirectory.po b/fusioninventory/locale/ar/fusiondirectory.po
index 1f74be1035b93a8ee93ee049da45416285bda382..cfb94415e6cbe957eaa571ce3e79f2dc7f174c8f 100644
--- a/fusioninventory/locale/ar/fusiondirectory.po
+++ b/fusioninventory/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -139,12 +139,12 @@ msgid "Matching system"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr "نظام"
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr ""
 msgid "Processes"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr ""
 
diff --git a/fusioninventory/locale/ca/fusiondirectory.po b/fusioninventory/locale/ca/fusiondirectory.po
index ab2b6654fbee6967a877026c43ec79286ca73d02..4a6d9fc296f23c0b9a2bf8b711daf91cfd5b393c 100644
--- a/fusioninventory/locale/ca/fusiondirectory.po
+++ b/fusioninventory/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -139,12 +139,12 @@ msgid "Matching system"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr ""
 msgid "Processes"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr ""
 
diff --git a/fusioninventory/locale/cs_CZ/fusiondirectory.po b/fusioninventory/locale/cs_CZ/fusiondirectory.po
index c151335e5a6c974f1412b91b576f27065849b771..1c61e55d6c2c231057265cd2eff5d2c7c4b66b05 100644
--- a/fusioninventory/locale/cs_CZ/fusiondirectory.po
+++ b/fusioninventory/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/inventory/class_inventoryManagement.inc:36
 msgid "Inventory objects"
@@ -141,12 +141,12 @@ msgid "Matching system"
 msgstr "Odpovídající systém"
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr "Systém"
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr "Systémová položka odpovídající tomuto inventáři"
 
@@ -166,15 +166,15 @@ msgstr "uživatelé"
 msgid "Processes"
 msgstr "Procesy"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr "Vytvořit systém na základě tohoto inventáře"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr "vytvořit"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr ""
 
diff --git a/fusioninventory/locale/de/fusiondirectory.po b/fusioninventory/locale/de/fusiondirectory.po
index 65a939dbcf48c6dfe7fe05eb0ecdcf9b61461d7a..6baf51dfb004f006610180de5c9a9075daeb0705 100644
--- a/fusioninventory/locale/de/fusiondirectory.po
+++ b/fusioninventory/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -139,12 +139,12 @@ msgid "Matching system"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr "System"
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr "Benutzer"
 msgid "Processes"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr "Anlegen"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr ""
 
diff --git a/fusioninventory/locale/el_GR/fusiondirectory.po b/fusioninventory/locale/el_GR/fusiondirectory.po
index f4fbf6277cc10ec2fca7235bf286cfdcee650467..7b24684bca780e7141f00a00d20ec38f217dc473 100644
--- a/fusioninventory/locale/el_GR/fusiondirectory.po
+++ b/fusioninventory/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -141,12 +141,12 @@ msgid "Matching system"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr "Σύστημα"
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr ""
 
@@ -166,15 +166,15 @@ msgstr "Χρήστες"
 msgid "Processes"
 msgstr "Διεργασίες"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr "Δημιουργία"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr ""
 
diff --git a/fusioninventory/locale/es/fusiondirectory.po b/fusioninventory/locale/es/fusiondirectory.po
index 9c09f047470101bd9c52768f61462fa8083c7aef..f7ca5b9f03d4fb1aff7a86258e6dcd82ebc07aad 100644
--- a/fusioninventory/locale/es/fusiondirectory.po
+++ b/fusioninventory/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -139,12 +139,12 @@ msgid "Matching system"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr "Sistema"
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr "Usuarios"
 msgid "Processes"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr "Crear"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr ""
 
diff --git a/fusioninventory/locale/es_CO/fusiondirectory.po b/fusioninventory/locale/es_CO/fusiondirectory.po
index 50015334f9b3805175754b5fc560b857ea7159d7..37f48b19a392d57083d0db04816fd270f80f07d9 100644
--- a/fusioninventory/locale/es_CO/fusiondirectory.po
+++ b/fusioninventory/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -139,12 +139,12 @@ msgid "Matching system"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr "Usuarios"
 msgid "Processes"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr "Crear"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr ""
 
diff --git a/fusioninventory/locale/es_VE/fusiondirectory.po b/fusioninventory/locale/es_VE/fusiondirectory.po
index 438a645efaaa5503a913c252c7245a8a68af0c5a..88db0e35573915fe34bde758571062075f780ba7 100644
--- a/fusioninventory/locale/es_VE/fusiondirectory.po
+++ b/fusioninventory/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -139,12 +139,12 @@ msgid "Matching system"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr "Sistema"
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr "Usuarios"
 msgid "Processes"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr "Crear"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr ""
 
diff --git a/fusioninventory/locale/fa_IR/fusiondirectory.po b/fusioninventory/locale/fa_IR/fusiondirectory.po
index 001bf09ad621212a0f8add1dcd4199d470b57ac2..b0c5f4902f0db00f50df19e3114b374bca45aaee 100644
--- a/fusioninventory/locale/fa_IR/fusiondirectory.po
+++ b/fusioninventory/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/inventory/class_inventoryManagement.inc:36
 msgid "Inventory objects"
@@ -138,12 +138,12 @@ msgid "Matching system"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr ""
 
@@ -163,15 +163,15 @@ msgstr ""
 msgid "Processes"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr ""
 
diff --git a/fusioninventory/locale/fi_FI/fusiondirectory.po b/fusioninventory/locale/fi_FI/fusiondirectory.po
index 463c17c7352cce0e1b8663df14bb76decae9f74a..748984b693ea00b63e3e09c96d8d66166320492e 100644
--- a/fusioninventory/locale/fi_FI/fusiondirectory.po
+++ b/fusioninventory/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
@@ -139,12 +139,12 @@ msgid "Matching system"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr ""
 msgid "Processes"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr "Luo"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr ""
 
diff --git a/fusioninventory/locale/fr/fusiondirectory.po b/fusioninventory/locale/fr/fusiondirectory.po
index b84727de82bc607cbb242cb9ffafcd5ed941a85d..2f69c4b5a6e8a25a54c8ae59418ef5e209ad5f01 100644
--- a/fusioninventory/locale/fr/fusiondirectory.po
+++ b/fusioninventory/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
@@ -139,12 +139,12 @@ msgid "Matching system"
 msgstr "système correspondant"
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr "Système"
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr "l'entrée du système correspondant à cet inventaire"
 
@@ -164,15 +164,15 @@ msgstr "Utilisateurs"
 msgid "Processes"
 msgstr "Processus"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 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
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr "Créer"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 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 b318215d3c5a1317252dfd4aa89e8f841f068f2c..d649fd69adb6c59cc74a2c3a6aad905775f9be01 100644
--- a/fusioninventory/locale/hu_HU/fusiondirectory.po
+++ b/fusioninventory/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -139,12 +139,12 @@ msgid "Matching system"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr "Felhasználók"
 msgid "Processes"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr ""
 
diff --git a/fusioninventory/locale/id/fusiondirectory.po b/fusioninventory/locale/id/fusiondirectory.po
index 3394dfaae04e3e994e26f3d22cdfeabefd606330..7ede93c63584f3415b6e6b9cd881d461f477557a 100644
--- a/fusioninventory/locale/id/fusiondirectory.po
+++ b/fusioninventory/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -138,12 +138,12 @@ msgid "Matching system"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr ""
 
@@ -163,15 +163,15 @@ msgstr ""
 msgid "Processes"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr ""
 
diff --git a/fusioninventory/locale/it_IT/fusiondirectory.po b/fusioninventory/locale/it_IT/fusiondirectory.po
index a966bd705236fcb3d8cacd088dc0d6da84a2b0e1..39ebfff40794a9aff8b150490dbaf0a6d7c1139f 100644
--- a/fusioninventory/locale/it_IT/fusiondirectory.po
+++ b/fusioninventory/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
@@ -141,12 +141,12 @@ msgid "Matching system"
 msgstr "Sistema di ricerca"
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr "Sistema"
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr "Voce del sistema di corrispondenza di questo inventario"
 
@@ -166,15 +166,15 @@ msgstr "Utenti"
 msgid "Processes"
 msgstr "Processi"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr "Creare un sistema basato su questo inventario"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr "Crea"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr "Nessun sistema di corrispondenza"
 
diff --git a/fusioninventory/locale/ja/fusiondirectory.po b/fusioninventory/locale/ja/fusiondirectory.po
index 47af778cb62795eca6b3fd33286803d87f5f86f6..8aed2309d06fec3b6e40343b23d6d3e13b203a83 100644
--- a/fusioninventory/locale/ja/fusiondirectory.po
+++ b/fusioninventory/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -138,12 +138,12 @@ msgid "Matching system"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr ""
 
@@ -163,15 +163,15 @@ msgstr ""
 msgid "Processes"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr ""
 
diff --git a/fusioninventory/locale/ko/fusiondirectory.po b/fusioninventory/locale/ko/fusiondirectory.po
index efa976881198c103886248997e9d7c0ee8357c7b..f91dfcc3b4ed366572c9a4e95f6e071231f50fab 100644
--- a/fusioninventory/locale/ko/fusiondirectory.po
+++ b/fusioninventory/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
@@ -139,12 +139,12 @@ msgid "Matching system"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr ""
 msgid "Processes"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr ""
 
diff --git a/fusioninventory/locale/lv/fusiondirectory.po b/fusioninventory/locale/lv/fusiondirectory.po
index 28ec6e1275774d662d5c84764af84d23e36738d3..3ff2bff391253a4fdea822855165ea80432972d8 100644
--- a/fusioninventory/locale/lv/fusiondirectory.po
+++ b/fusioninventory/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -139,12 +139,12 @@ msgid "Matching system"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr "Lietotāji"
 msgid "Processes"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr "Izveidot"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr ""
 
diff --git a/fusioninventory/locale/nb/fusiondirectory.po b/fusioninventory/locale/nb/fusiondirectory.po
index 4a46771104f33e4a97873351ac61f70fcb66c532..493b49dcff553890b80429ae5f5cc2dc7610b40b 100644
--- a/fusioninventory/locale/nb/fusiondirectory.po
+++ b/fusioninventory/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -139,12 +139,12 @@ msgid "Matching system"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr ""
 msgid "Processes"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr "Opprett"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr ""
 
diff --git a/fusioninventory/locale/nl/fusiondirectory.po b/fusioninventory/locale/nl/fusiondirectory.po
index fe2675112cde43e8a26fda027e38352da07919b0..fc057cb182b18edb12d3cbaf02089eda1cfb7515 100644
--- a/fusioninventory/locale/nl/fusiondirectory.po
+++ b/fusioninventory/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
@@ -139,12 +139,12 @@ msgid "Matching system"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr "Systeem"
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr "Gebruikers"
 msgid "Processes"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr "Aanmaken"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr ""
 
diff --git a/fusioninventory/locale/pl/fusiondirectory.po b/fusioninventory/locale/pl/fusiondirectory.po
index 57217f6f5ab9b45d0634fd9af11a34ae52a27623..f0cd3c4a0ccb3b9b6e1bb4479a90976f9fee8349 100644
--- a/fusioninventory/locale/pl/fusiondirectory.po
+++ b/fusioninventory/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -139,12 +139,12 @@ msgid "Matching system"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr "System"
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr "Użytkownicy"
 msgid "Processes"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr "Utwórz"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr ""
 
diff --git a/fusioninventory/locale/pt/fusiondirectory.po b/fusioninventory/locale/pt/fusiondirectory.po
index adc0f6d901101af24a83d354c6d740eecc8d98a3..63d19a2b20ca32de3043e70bd87c05c56224a8bd 100644
--- a/fusioninventory/locale/pt/fusiondirectory.po
+++ b/fusioninventory/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -139,12 +139,12 @@ msgid "Matching system"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr "Usuários"
 msgid "Processes"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr "Criar"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr ""
 
diff --git a/fusioninventory/locale/pt_BR/fusiondirectory.po b/fusioninventory/locale/pt_BR/fusiondirectory.po
index 737399b3256c5461da2be9a07c2a0a48b2c2ac42..a72a0fe903bb574e44ddf1b41a13d10c7710846a 100644
--- a/fusioninventory/locale/pt_BR/fusiondirectory.po
+++ b/fusioninventory/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -140,12 +140,12 @@ msgid "Matching system"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr ""
 
@@ -165,15 +165,15 @@ msgstr "Usuários"
 msgid "Processes"
 msgstr "Processos"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr "Criar"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr ""
 
diff --git a/fusioninventory/locale/ru/fusiondirectory.po b/fusioninventory/locale/ru/fusiondirectory.po
index c403666a75aa5e6967ba562b644f86a4db31fe8f..a741a0bb94af11bccbd2a018fd2f6abb56b715af 100644
--- a/fusioninventory/locale/ru/fusiondirectory.po
+++ b/fusioninventory/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -139,12 +139,12 @@ msgid "Matching system"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr "Пользователи"
 msgid "Processes"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr "Создать"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr ""
 
diff --git a/fusioninventory/locale/ru@petr1708/fusiondirectory.po b/fusioninventory/locale/ru@petr1708/fusiondirectory.po
index 33fd1d601a287598ce8e57a4382800fa58ad5bc9..56a2b21bbdbfde660fdd8b8e1d86e4aac1114543 100644
--- a/fusioninventory/locale/ru@petr1708/fusiondirectory.po
+++ b/fusioninventory/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -138,12 +138,12 @@ msgid "Matching system"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr ""
 
@@ -163,15 +163,15 @@ msgstr ""
 msgid "Processes"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr ""
 
diff --git a/fusioninventory/locale/sv/fusiondirectory.po b/fusioninventory/locale/sv/fusiondirectory.po
index ae6b97c62d0b0e3b19f0561fc4bf09099f137b56..e074e0a40bdce0ebd1eb18ee5df1c0178997a893 100644
--- a/fusioninventory/locale/sv/fusiondirectory.po
+++ b/fusioninventory/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -139,12 +139,12 @@ msgid "Matching system"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr "Användare"
 msgid "Processes"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr "Skapa"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr ""
 
diff --git a/fusioninventory/locale/tr_TR/fusiondirectory.po b/fusioninventory/locale/tr_TR/fusiondirectory.po
index d568856c81d3c45f76e15716c4fd4ed8ec9f356c..bb80d9c54c357900d6630163981db81c1834e10c 100644
--- a/fusioninventory/locale/tr_TR/fusiondirectory.po
+++ b/fusioninventory/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
@@ -138,12 +138,12 @@ msgid "Matching system"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr ""
 
@@ -163,15 +163,15 @@ msgstr ""
 msgid "Processes"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr ""
 
diff --git a/fusioninventory/locale/ug/fusiondirectory.po b/fusioninventory/locale/ug/fusiondirectory.po
index f4f4a6eeb1e456eb24713685d8102988dd228844..2aea7ea8a091093478a65d3aa39849756db8cd71 100644
--- a/fusioninventory/locale/ug/fusiondirectory.po
+++ b/fusioninventory/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -138,12 +138,12 @@ msgid "Matching system"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr ""
 
@@ -163,15 +163,15 @@ msgstr ""
 msgid "Processes"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr ""
 
diff --git a/fusioninventory/locale/vi_VN/fusiondirectory.po b/fusioninventory/locale/vi_VN/fusiondirectory.po
index bd4639142a6305ca0b115a29fdeeaf3a4d3c08e8..cd9a33d46d269dcdcc731a309269fb3eefb5a792 100644
--- a/fusioninventory/locale/vi_VN/fusiondirectory.po
+++ b/fusioninventory/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -139,12 +139,12 @@ msgid "Matching system"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr "Người dùng"
 msgid "Processes"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr "Tạo "
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr ""
 
diff --git a/fusioninventory/locale/zh/fusiondirectory.po b/fusioninventory/locale/zh/fusiondirectory.po
index e4d123cb2b5cb565cb803e2142180f984574a954..c1ea22e718354c2f061587039a4844da0f98ebde 100644
--- a/fusioninventory/locale/zh/fusiondirectory.po
+++ b/fusioninventory/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -139,12 +139,12 @@ msgid "Matching system"
 msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System"
 msgstr "系统"
 
 #: admin/systems/fusioninventory/class_fiInventory.inc:96
-#: admin/systems/fusioninventory/class_fiInventory.inc:372
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
 msgid "System entry matching this inventory"
 msgstr ""
 
@@ -164,15 +164,15 @@ msgstr "用户"
 msgid "Processes"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:320
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
 msgid "Create a system based on this inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:335
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
 msgid "Create"
 msgstr "创建"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:340
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
 msgid "No matching system"
 msgstr ""
 
diff --git a/fusioninventory/locale/zh_TW/fusiondirectory.po b/fusioninventory/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..321fbd53e0ed5768b718b366d56b03e7a0ad03e2
--- /dev/null
+++ b/fusioninventory/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,221 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/inventory/class_inventoryManagement.inc:36
+msgid "Inventory objects"
+msgstr ""
+
+#: admin/inventory/class_inventoryManagement.inc:37
+msgid "Browse inventory objects"
+msgstr ""
+
+#: admin/inventory/inventory-list.xml:7
+msgid "NO LABEL"
+msgstr ""
+
+#: admin/inventory/inventory-list.xml:28
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:56
+msgid "IP"
+msgstr ""
+
+#: admin/inventory/inventory-list.xml:36
+msgid "Macs"
+msgstr ""
+
+#: admin/inventory/inventory-list.xml:44
+msgid "Operating Systems"
+msgstr ""
+
+#: admin/inventory/inventory-list.xml:50
+msgid "Actions"
+msgstr ""
+
+#: admin/inventory/inventory-list.xml:61 admin/inventory/inventory-list.xml:85
+msgid "Edit"
+msgstr ""
+
+#: admin/inventory/inventory-list.xml:68 admin/inventory/inventory-list.xml:92
+msgid "Remove"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
+msgid "Configuration"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:33
+msgid "Server"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:33
+msgid "Server which FI will send inventory infos"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:37
+msgid "Delay time"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:37
+msgid "Maximum initial delay before first target, in seconds"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:42
+msgid "Wait"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:42
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:60
+msgid "Maximum delay between each targets, in seconds"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:49
+msgid "Web Interface"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:52
+msgid "Disable web interface"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:52
+msgid "Do not use web interface"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:56
+msgid "Network interface to listen to"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:60
+msgid "Port"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:65
+msgid "Trust"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:65
+msgid "IPs allowed to launch inventory task through web interface"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
+#: config/fusioninventory/class_fiConfig.inc:41
+msgid "FusionInventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
+msgid "FusionInventory agent configuration"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
+msgid "Inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
+msgid "Inventory Viewer"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
+msgid "Inventory object"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
+msgid "System"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:378
+msgid "System entry matching this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
+msgid "Hardware"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
+msgid "Software"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
+msgid "Users"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
+msgid "Processes"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:326
+msgid "Create a system based on this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:341
+msgid "Create"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:346
+msgid "No matching system"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:28
+msgid "FusionInventory configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:29
+msgid "FusionDirectory FusionInventory plugin configuration"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Inventory RDN"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:44
+msgid "Branch in which inventory objects will be stored"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Inventory matching"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:49
+msgid "Criteria to link an inventory result to a system"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Mac address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP address"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "Both"
+msgstr ""
+
+#: config/fusioninventory/class_fiConfig.inc:52
+msgid "IP or Mac address"
+msgstr ""
+
+#: html/collect.php:83
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr ""
diff --git a/gpg/locale/af_ZA/fusiondirectory.po b/gpg/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..77a7dc6d5a65a42bc2fe9958168c82dfc33a6c84
--- /dev/null
+++ b/gpg/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,135 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
+#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
+msgid "GPG server info"
+msgstr ""
+
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
+msgstr ""
+
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
+msgstr ""
+
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
+msgstr ""
+
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
+msgstr ""
+
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
+msgstr ""
+
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
+msgstr ""
+
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
+msgstr ""
+
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
+msgstr ""
+
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
+msgstr ""
+
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
+msgstr ""
+
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "User ID"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Creation time"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+msgid "Expiration"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+msgid "Algorithm"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
+msgid "Please select the desired entries"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:15
+msgid "PGP Key"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
+msgid "User"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:56
+msgid "Creation date"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:64
+msgid "Expiration date"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:72
+msgid "Type"
+msgstr ""
diff --git a/gpg/locale/ar/fusiondirectory.po b/gpg/locale/ar/fusiondirectory.po
index 5c259560d46193b98f2e1491c1497359af0a5faf..07af316f8620e73114c3947fae1ff176740cf68c 100644
--- a/gpg/locale/ar/fusiondirectory.po
+++ b/gpg/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/gpg/locale/ca/fusiondirectory.po b/gpg/locale/ca/fusiondirectory.po
index c7bf4cdf5c89f3f41bd401407f754fb0c4ecc051..7079435088ca4429de3cd3e2f8a90b7bbccf9d1d 100644
--- a/gpg/locale/ca/fusiondirectory.po
+++ b/gpg/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/gpg/locale/cs_CZ/fusiondirectory.po b/gpg/locale/cs_CZ/fusiondirectory.po
index 3cce47a3ed8a2fef9537d9fafbce67c5db26ca72..122683beb9a000d7974a46bae1efbc391c1c2d11 100644
--- a/gpg/locale/cs_CZ/fusiondirectory.po
+++ b/gpg/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
 #: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
diff --git a/gpg/locale/de/fusiondirectory.po b/gpg/locale/de/fusiondirectory.po
index f565acd97183cc4e46d9578102d921e2dc9953fd..d01ff82a3c7bd5ae585598efe363c4cb68258b09 100644
--- a/gpg/locale/de/fusiondirectory.po
+++ b/gpg/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/gpg/locale/el_GR/fusiondirectory.po b/gpg/locale/el_GR/fusiondirectory.po
index 4ec079af6b7fa272e8af4e64ac14ef7cf128eb6b..8ade041cb2d53b5ce2d383df3a9e2ae01cd96cd7 100644
--- a/gpg/locale/el_GR/fusiondirectory.po
+++ b/gpg/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/gpg/locale/es/fusiondirectory.po b/gpg/locale/es/fusiondirectory.po
index a692fd8046ea912192081846c57918612e9f3b76..859e3fcd37ac53d3dab4c3bd2bffce31d63b8f3d 100644
--- a/gpg/locale/es/fusiondirectory.po
+++ b/gpg/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/gpg/locale/es_CO/fusiondirectory.po b/gpg/locale/es_CO/fusiondirectory.po
index b126a456faec6c71c74868e9675bb9f98e55f59c..785689b19f5b42ac98dd0221dba7b2d5d409e49f 100644
--- a/gpg/locale/es_CO/fusiondirectory.po
+++ b/gpg/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/gpg/locale/es_VE/fusiondirectory.po b/gpg/locale/es_VE/fusiondirectory.po
index 147f3b4a55b672a217e52e617b02b39ff7a6739e..464380fc3db2a68e15cbf82f7d01fc5952798a45 100644
--- a/gpg/locale/es_VE/fusiondirectory.po
+++ b/gpg/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/gpg/locale/fa_IR/fusiondirectory.po b/gpg/locale/fa_IR/fusiondirectory.po
index 88fdc41310590712dfcdfffe752b578201406436..0a7d5a2dcd7a6fcaaa8b7735244f79d2f537dbc2 100644
--- a/gpg/locale/fa_IR/fusiondirectory.po
+++ b/gpg/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
 #: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
diff --git a/gpg/locale/fi_FI/fusiondirectory.po b/gpg/locale/fi_FI/fusiondirectory.po
index 05212d4c12afca983a8a2530e2dd73e46127f825..bc2582f0ed4767e019ffce648d2793505e55caf4 100644
--- a/gpg/locale/fi_FI/fusiondirectory.po
+++ b/gpg/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/gpg/locale/fr/fusiondirectory.po b/gpg/locale/fr/fusiondirectory.po
index cd80845a665d4b3817d157677e7248b8db611d55..959b9f0d68876f547503229906c80f2bc4f9f065 100644
--- a/gpg/locale/fr/fusiondirectory.po
+++ b/gpg/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/gpg/locale/hu_HU/fusiondirectory.po b/gpg/locale/hu_HU/fusiondirectory.po
index cdc201aa7be8b1f35ae66356a42a4b1a865eceba..ddeb9aa50e7264debaf5f8045f87ae71cc4ad55c 100644
--- a/gpg/locale/hu_HU/fusiondirectory.po
+++ b/gpg/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/gpg/locale/id/fusiondirectory.po b/gpg/locale/id/fusiondirectory.po
index 29803cfbc2481663325659f5e7b00c5868c0d8b4..4b37d640bfca920cbddcac8ebe3075c80c880ce4 100644
--- a/gpg/locale/id/fusiondirectory.po
+++ b/gpg/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/gpg/locale/it_IT/fusiondirectory.po b/gpg/locale/it_IT/fusiondirectory.po
index 9a9642d48dc13c3b377f99514a6a7fb41a63b54c..c30a5ac5759f2e5cc500ebe104b230d82d2c9eb8 100644
--- a/gpg/locale/it_IT/fusiondirectory.po
+++ b/gpg/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/gpg/locale/ja/fusiondirectory.po b/gpg/locale/ja/fusiondirectory.po
index 586a6226f23241ccda2db8c0003297202cb65e59..bf5f0091da952ff74f1e305de1322d103e4b2198 100644
--- a/gpg/locale/ja/fusiondirectory.po
+++ b/gpg/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/gpg/locale/ko/fusiondirectory.po b/gpg/locale/ko/fusiondirectory.po
index e1fc19d6809cda09512a02a073fa262d5c795ddf..074e201989bb6ae939f01af02b8772489062c789 100644
--- a/gpg/locale/ko/fusiondirectory.po
+++ b/gpg/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/gpg/locale/lv/fusiondirectory.po b/gpg/locale/lv/fusiondirectory.po
index faa73e606061b6dc85dd2fd16a2b0d7797cef482..3d9defe2b7512dffdf239d76e5e96ff218cfbf69 100644
--- a/gpg/locale/lv/fusiondirectory.po
+++ b/gpg/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/gpg/locale/nb/fusiondirectory.po b/gpg/locale/nb/fusiondirectory.po
index 913028d69ec5106ef69b40b6624f7e5e85f3089d..3ad9ce28f606fb529d04f14109f6a5ccdbd24e53 100644
--- a/gpg/locale/nb/fusiondirectory.po
+++ b/gpg/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/gpg/locale/nl/fusiondirectory.po b/gpg/locale/nl/fusiondirectory.po
index 2fa8c8eed6dea2566c18eddf972a92f684ca184f..15f4ebb82a7e13cd999597db2c30a99492fe7f3d 100644
--- a/gpg/locale/nl/fusiondirectory.po
+++ b/gpg/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/gpg/locale/pl/fusiondirectory.po b/gpg/locale/pl/fusiondirectory.po
index ff95bea77912ddf4e46c078f0f1d831d6e964c9d..3fd2a1afb8d326a64488c9c25da3a803ec3fad3a 100644
--- a/gpg/locale/pl/fusiondirectory.po
+++ b/gpg/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/gpg/locale/pt/fusiondirectory.po b/gpg/locale/pt/fusiondirectory.po
index 740cd1f6b5e906e7689718cc618db0e835c3a63b..a9244cc61b55ca89ff3c5c3db455e9ed68731062 100644
--- a/gpg/locale/pt/fusiondirectory.po
+++ b/gpg/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/gpg/locale/pt_BR/fusiondirectory.po b/gpg/locale/pt_BR/fusiondirectory.po
index 032861ae06a79bbcb6cdee364e16fcb737d27d91..0a7c1b72aed54542c5fd67966d8a9a656c72ac5c 100644
--- a/gpg/locale/pt_BR/fusiondirectory.po
+++ b/gpg/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/gpg/locale/ru/fusiondirectory.po b/gpg/locale/ru/fusiondirectory.po
index eb2ebdaf6c6304b5297bb29474a18826372dbe78..81353c13b431d88a0a7c72644ea04c9e103fa829 100644
--- a/gpg/locale/ru/fusiondirectory.po
+++ b/gpg/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/gpg/locale/ru@petr1708/fusiondirectory.po b/gpg/locale/ru@petr1708/fusiondirectory.po
index 0dba113d5f53e3533048a6f80dcabd47282dc95e..ebe68f26d09be2ee9a2250f1a50512cb2bf89e4a 100644
--- a/gpg/locale/ru@petr1708/fusiondirectory.po
+++ b/gpg/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/gpg/locale/sv/fusiondirectory.po b/gpg/locale/sv/fusiondirectory.po
index e30b276b2871da03d6a5b48288322df3866db1b6..cc1a83f05cfdea3da8ea65b0f103a5842685a33e 100644
--- a/gpg/locale/sv/fusiondirectory.po
+++ b/gpg/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/gpg/locale/tr_TR/fusiondirectory.po b/gpg/locale/tr_TR/fusiondirectory.po
index f47bd31a3701a9cec70dad4982593fecf738aae2..e8b7cb836fc5dcbcda42ecd5ff33b5f2635e900e 100644
--- a/gpg/locale/tr_TR/fusiondirectory.po
+++ b/gpg/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/gpg/locale/ug/fusiondirectory.po b/gpg/locale/ug/fusiondirectory.po
index ffa2e332b672ec7d578ffcca9017c0b4deb87bcf..c80abb1008772dee94c09f0026a78b24aa98bc16 100644
--- a/gpg/locale/ug/fusiondirectory.po
+++ b/gpg/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/gpg/locale/vi_VN/fusiondirectory.po b/gpg/locale/vi_VN/fusiondirectory.po
index 91156f84d6db734164261a857ef2871648ed818a..d4fab0e779416cd8495df36eabe6ff8fdc9684ba 100644
--- a/gpg/locale/vi_VN/fusiondirectory.po
+++ b/gpg/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/gpg/locale/zh/fusiondirectory.po b/gpg/locale/zh/fusiondirectory.po
index 8f44051dd4e5fdceefd58399cbb36b489a072dad..a64d507845984e8b072654308184341dc7a7cd3e 100644
--- a/gpg/locale/zh/fusiondirectory.po
+++ b/gpg/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/gpg/locale/zh_TW/fusiondirectory.po b/gpg/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..0719df276ac6b16e9aaf57c77fcdb91221b0471d
--- /dev/null
+++ b/gpg/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,135 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
+#: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
+msgid "GPG server info"
+msgstr ""
+
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Software"
+msgstr ""
+
+#: addons/gpg/class_pgpServerInfo.inc:60
+msgid "Which software this GPG key server is running"
+msgstr ""
+
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "GPG version"
+msgstr ""
+
+#: addons/gpg/class_pgpServerInfo.inc:65
+msgid "Which version of GPG this key server is running"
+msgstr ""
+
+#: addons/gpg/class_pgpServerInfo.inc:70
+msgid "Branch in which keys are stored"
+msgstr ""
+
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Keys RDN"
+msgstr ""
+
+#: addons/gpg/class_pgpServerInfo.inc:74
+msgid "Branch under base in which keys are stored"
+msgstr ""
+
+#: personal/gpg/class_gpgAccount.inc:31
+msgid "GPG keys"
+msgstr ""
+
+#: personal/gpg/class_gpgAccount.inc:35
+msgid "GPG keys of this user"
+msgstr ""
+
+#: personal/gpg/class_gpgAccount.inc:46
+msgid "GPG"
+msgstr ""
+
+#: personal/gpg/class_gpgAccount.inc:47
+msgid "Edit user's GPG IDs"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "Configuration error"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
+msgid "You need to configure GPG base dn through the addons section first"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
+msgid "Key ID"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
+msgid "User ID"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
+msgid "Creation time"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
+msgid "Expiration"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
+msgid "Algorithm"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
+msgid "Size"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
+msgid "Revoked"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
+msgid "Disabled"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
+msgid "Please select the desired entries"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:15
+msgid "PGP Key"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
+msgid "User"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:56
+msgid "Creation date"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:64
+msgid "Expiration date"
+msgstr ""
+
+#: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:72
+msgid "Type"
+msgstr ""
diff --git a/ipmi/locale/af_ZA/fusiondirectory.po b/ipmi/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..b6be0c93be44b326705d59b34b1c2f81995b9147
--- /dev/null
+++ b/ipmi/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/systems/ipmi/class_ipmiClient.inc:31
+msgid "IPMI client"
+msgstr ""
+
+#: admin/systems/ipmi/class_ipmiClient.inc:32
+msgid "Edit IPMI client settings"
+msgstr ""
+
+#: admin/systems/ipmi/class_ipmiClient.inc:45
+msgid "IPMI client settings"
+msgstr ""
+
+#: admin/systems/ipmi/class_ipmiClient.inc:48
+msgid "IP"
+msgstr ""
+
+#: admin/systems/ipmi/class_ipmiClient.inc:48
+msgid "IP of the IPMI interface"
+msgstr ""
+
+#: admin/systems/ipmi/class_ipmiClient.inc:52
+msgid "User login"
+msgstr ""
+
+#: admin/systems/ipmi/class_ipmiClient.inc:52
+msgid "IPMI user login"
+msgstr ""
+
+#: admin/systems/ipmi/class_ipmiClient.inc:57
+msgid "User password"
+msgstr ""
+
+#: admin/systems/ipmi/class_ipmiClient.inc:57
+msgid "IPMI user password"
+msgstr ""
diff --git a/ipmi/locale/ar/fusiondirectory.po b/ipmi/locale/ar/fusiondirectory.po
index a3dd01eebf227cbd8cb35cd0d1382fa7ddcc5306..ca8bf98023a0e20632bfc1d9e53ead0020aa7fa3 100644
--- a/ipmi/locale/ar/fusiondirectory.po
+++ b/ipmi/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/ca/fusiondirectory.po b/ipmi/locale/ca/fusiondirectory.po
index f4f1cd51ed372657fdc134b70c22209147f05097..b8d4d4425ad92e148c36949bff81837a02f92522 100644
--- a/ipmi/locale/ca/fusiondirectory.po
+++ b/ipmi/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/cs_CZ/fusiondirectory.po b/ipmi/locale/cs_CZ/fusiondirectory.po
index dde939eac673057a6220ef87435e251adb5ce35c..ca00a1906b4de2e2786f6bd41912aef017dd0a66 100644
--- a/ipmi/locale/cs_CZ/fusiondirectory.po
+++ b/ipmi/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:31
 msgid "IPMI client"
diff --git a/ipmi/locale/de/fusiondirectory.po b/ipmi/locale/de/fusiondirectory.po
index ee861bc628c682c7d8ba872e1b671e316a6b4e59..e20ad4445599eb0eca049c9e8d01281b13422d3b 100644
--- a/ipmi/locale/de/fusiondirectory.po
+++ b/ipmi/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ipmi/locale/el_GR/fusiondirectory.po b/ipmi/locale/el_GR/fusiondirectory.po
index c5195239c05f5cfe95bf1870989fec233caca538..f3af619d4bfffc78cc6dd8e5c5303b7df3366054 100644
--- a/ipmi/locale/el_GR/fusiondirectory.po
+++ b/ipmi/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ipmi/locale/es/fusiondirectory.po b/ipmi/locale/es/fusiondirectory.po
index ebb57a2bd6855323c39158407ad02acf628970f2..c51d097e79513438e90aa47fdb1e049f074f3fb4 100644
--- a/ipmi/locale/es/fusiondirectory.po
+++ b/ipmi/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ipmi/locale/es_CO/fusiondirectory.po b/ipmi/locale/es_CO/fusiondirectory.po
index 805be86fdb02fc84f44e020d7882a46be3258c5c..23ac8ca675f3fc10eb03bd20c2433c51bba1ee57 100644
--- a/ipmi/locale/es_CO/fusiondirectory.po
+++ b/ipmi/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/es_VE/fusiondirectory.po b/ipmi/locale/es_VE/fusiondirectory.po
index 0b3656261431b3b78a80892da1f5bcdf2718ac9a..41b667b67892971ad91c98a650759678703ae441 100644
--- a/ipmi/locale/es_VE/fusiondirectory.po
+++ b/ipmi/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ipmi/locale/fa_IR/fusiondirectory.po b/ipmi/locale/fa_IR/fusiondirectory.po
index 3dbfa19a4d4a176638acfd8ad865219a6f08e8fa..1d2e9e9cb71e968f8e51db7ad540659efc6ca738 100644
--- a/ipmi/locale/fa_IR/fusiondirectory.po
+++ b/ipmi/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:31
 msgid "IPMI client"
diff --git a/ipmi/locale/fi_FI/fusiondirectory.po b/ipmi/locale/fi_FI/fusiondirectory.po
index 9753d764839e9cb006c4fa5c0766a6746cb75475..1bba0204325fcc486bf3c950de49a3341d6250e4 100644
--- a/ipmi/locale/fi_FI/fusiondirectory.po
+++ b/ipmi/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/fr/fusiondirectory.po b/ipmi/locale/fr/fusiondirectory.po
index 85791d51d044638f1d16f0af3762492ec5fab765..a294d2b1cb13ec9c25c88ab66bfbceaba34ec4ab 100644
--- a/ipmi/locale/fr/fusiondirectory.po
+++ b/ipmi/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/ipmi/locale/hu_HU/fusiondirectory.po b/ipmi/locale/hu_HU/fusiondirectory.po
index cf7dd65f141204f9d20a3b7862bce99770cec714..b7d1cb320b920e610240e4d8b986526716b0d166 100644
--- a/ipmi/locale/hu_HU/fusiondirectory.po
+++ b/ipmi/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/id/fusiondirectory.po b/ipmi/locale/id/fusiondirectory.po
index 4a0ccbb398b2eaf49e465a2d992ec8c704b25d26..03941a7ef2c1292737bada1d81cedb335754493d 100644
--- a/ipmi/locale/id/fusiondirectory.po
+++ b/ipmi/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/it_IT/fusiondirectory.po b/ipmi/locale/it_IT/fusiondirectory.po
index 37c9db45a64805c2af303aa98d33001fe0eb0f3d..8573b1b8f46d3256277fc3bba95eaaa7407051f2 100644
--- a/ipmi/locale/it_IT/fusiondirectory.po
+++ b/ipmi/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/ipmi/locale/ja/fusiondirectory.po b/ipmi/locale/ja/fusiondirectory.po
index f4cdf1d4c5bafa9457644d060bb9bb2ec26852be..7791494ebdf6a22ad9386163034624a759c05ea3 100644
--- a/ipmi/locale/ja/fusiondirectory.po
+++ b/ipmi/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/ko/fusiondirectory.po b/ipmi/locale/ko/fusiondirectory.po
index 7a7c23ffff47024021636b6705ae80a49dcef4c2..c8455e1cce4cb467a911bf1dd58cb20db7c55d55 100644
--- a/ipmi/locale/ko/fusiondirectory.po
+++ b/ipmi/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/ipmi/locale/lv/fusiondirectory.po b/ipmi/locale/lv/fusiondirectory.po
index 2977f944f5faf493d281accc788d185ec76e240c..0efcf5cf04646454c6579c42205ee95ab26b7069 100644
--- a/ipmi/locale/lv/fusiondirectory.po
+++ b/ipmi/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/nb/fusiondirectory.po b/ipmi/locale/nb/fusiondirectory.po
index 4166ef3dd6e79d1dccf5d978c440b2bcbf57c948..e5cd44950fd1a6dd7c1b0d3b039c1c44306537e2 100644
--- a/ipmi/locale/nb/fusiondirectory.po
+++ b/ipmi/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/nl/fusiondirectory.po b/ipmi/locale/nl/fusiondirectory.po
index 1eb3c52abd29d03059a190de1c7c410d3d4fb63a..44d574af087da268fdd4cdbefb68c41db7a6ceea 100644
--- a/ipmi/locale/nl/fusiondirectory.po
+++ b/ipmi/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/ipmi/locale/pl/fusiondirectory.po b/ipmi/locale/pl/fusiondirectory.po
index e13cba89ae2fa304e29a42a2b2d34a0c67da7929..d0c2dfef6a4093630521601153a18034bf2c606b 100644
--- a/ipmi/locale/pl/fusiondirectory.po
+++ b/ipmi/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ipmi/locale/pt/fusiondirectory.po b/ipmi/locale/pt/fusiondirectory.po
index 2663bce6045a1ab4363600cbd9782b6eafed2102..5ae4aa1bb684eb26bb692732b7822d477b1af522 100644
--- a/ipmi/locale/pt/fusiondirectory.po
+++ b/ipmi/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/pt_BR/fusiondirectory.po b/ipmi/locale/pt_BR/fusiondirectory.po
index 4f03c8b57a6abba60cb8cae22ed7c8c66c87564f..02564265ebae9f6373ea0f3ee1c4e7bfe89395ac 100644
--- a/ipmi/locale/pt_BR/fusiondirectory.po
+++ b/ipmi/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ipmi/locale/ru/fusiondirectory.po b/ipmi/locale/ru/fusiondirectory.po
index d1cb5ff837baf28ad0c9d047d9d9714c9c1e6dc1..4f78d616934ee4e921867719a5edd0f96c4c973f 100644
--- a/ipmi/locale/ru/fusiondirectory.po
+++ b/ipmi/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ipmi/locale/ru@petr1708/fusiondirectory.po b/ipmi/locale/ru@petr1708/fusiondirectory.po
index 370cc5ca8623059fa9686e917744ebad9f060667..d27ecd8dc19f466d73db0b72a6b0716815b9521b 100644
--- a/ipmi/locale/ru@petr1708/fusiondirectory.po
+++ b/ipmi/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/sv/fusiondirectory.po b/ipmi/locale/sv/fusiondirectory.po
index 2e84d34ec6ccf890c517d78dd5e0a8690363e538..61e330277e23a3d266a1d4dfc112e472f7b279df 100644
--- a/ipmi/locale/sv/fusiondirectory.po
+++ b/ipmi/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/tr_TR/fusiondirectory.po b/ipmi/locale/tr_TR/fusiondirectory.po
index 4b3af441fcc68406f587222ee4e95e0c2724a7d5..0bced95a7954379ebcda19254020274fe8839fcf 100644
--- a/ipmi/locale/tr_TR/fusiondirectory.po
+++ b/ipmi/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/ug/fusiondirectory.po b/ipmi/locale/ug/fusiondirectory.po
index 09b9166d3137bad59e639f0e9c82d1717fd738f0..b81230378855d3ae663f88551bfc15b930b3543c 100644
--- a/ipmi/locale/ug/fusiondirectory.po
+++ b/ipmi/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/vi_VN/fusiondirectory.po b/ipmi/locale/vi_VN/fusiondirectory.po
index 2c1a873306ebefef4ea6d61f5af48083f662a381..99cc024220957487fdc4ee3ff1dea99cc5b4a444 100644
--- a/ipmi/locale/vi_VN/fusiondirectory.po
+++ b/ipmi/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/zh/fusiondirectory.po b/ipmi/locale/zh/fusiondirectory.po
index e3a2e60849aacd3d85ffa44c7c5df29060d4c259..e1942e94075ea5f2580f0fe49de4fe559a91d75a 100644
--- a/ipmi/locale/zh/fusiondirectory.po
+++ b/ipmi/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ipmi/locale/zh_TW/fusiondirectory.po b/ipmi/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..d7042b68f1e83326ef1ce08b142b485476b46f5a
--- /dev/null
+++ b/ipmi/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/systems/ipmi/class_ipmiClient.inc:31
+msgid "IPMI client"
+msgstr ""
+
+#: admin/systems/ipmi/class_ipmiClient.inc:32
+msgid "Edit IPMI client settings"
+msgstr ""
+
+#: admin/systems/ipmi/class_ipmiClient.inc:45
+msgid "IPMI client settings"
+msgstr ""
+
+#: admin/systems/ipmi/class_ipmiClient.inc:48
+msgid "IP"
+msgstr ""
+
+#: admin/systems/ipmi/class_ipmiClient.inc:48
+msgid "IP of the IPMI interface"
+msgstr ""
+
+#: admin/systems/ipmi/class_ipmiClient.inc:52
+msgid "User login"
+msgstr ""
+
+#: admin/systems/ipmi/class_ipmiClient.inc:52
+msgid "IPMI user login"
+msgstr ""
+
+#: admin/systems/ipmi/class_ipmiClient.inc:57
+msgid "User password"
+msgstr ""
+
+#: admin/systems/ipmi/class_ipmiClient.inc:57
+msgid "IPMI user password"
+msgstr ""
diff --git a/ldapdump/locale/af_ZA/fusiondirectory.po b/ldapdump/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..6ab2b1c178ac1886d9a27e0b81e62a0e9180cf2d
--- /dev/null
+++ b/ldapdump/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,30 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: addons/ldapdump/class_ldapDump.inc:26
+msgid "LDAP"
+msgstr ""
+
+#: addons/ldapdump/class_ldapDump.inc:27 addons/ldapdump/class_ldapDump.inc:39
+msgid "LDAP Dump"
+msgstr ""
+
+#: addons/ldapdump/ldapdump.tpl.c:2
+msgid "Insufficient rights"
+msgstr ""
diff --git a/ldapdump/locale/ar/fusiondirectory.po b/ldapdump/locale/ar/fusiondirectory.po
index 613087953fb73e5297e0bf4b7bae9339ebccc5dd..baf28bc3a8ce11bd55ba94c18718422959fbe8f3 100644
--- a/ldapdump/locale/ar/fusiondirectory.po
+++ b/ldapdump/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapdump/locale/ca/fusiondirectory.po b/ldapdump/locale/ca/fusiondirectory.po
index 0034393bd33130211b9749aab432f276a6d29c2f..99ebd8090c78639218b41b0d5b218ec8c7fa05b3 100644
--- a/ldapdump/locale/ca/fusiondirectory.po
+++ b/ldapdump/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapdump/locale/cs_CZ/fusiondirectory.po b/ldapdump/locale/cs_CZ/fusiondirectory.po
index cc2e779d9682075f987f624d555103df8349e95a..ec1e1308bfbba80117828f987cc91884d1efb3d4 100644
--- a/ldapdump/locale/cs_CZ/fusiondirectory.po
+++ b/ldapdump/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: addons/ldapdump/class_ldapDump.inc:26
 msgid "LDAP"
diff --git a/ldapdump/locale/de/fusiondirectory.po b/ldapdump/locale/de/fusiondirectory.po
index f139243144579249a1799b78dad7d626e4d2ed50..1b0978d6adfc9fce58172e2610dbcd9b3bf35261 100644
--- a/ldapdump/locale/de/fusiondirectory.po
+++ b/ldapdump/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ldapdump/locale/el_GR/fusiondirectory.po b/ldapdump/locale/el_GR/fusiondirectory.po
index 77bdf8de634cfb55a05c463286eefa9c831b0c35..a49285abee91cc07429e554e494039421c9e078f 100644
--- a/ldapdump/locale/el_GR/fusiondirectory.po
+++ b/ldapdump/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ldapdump/locale/es/fusiondirectory.po b/ldapdump/locale/es/fusiondirectory.po
index 7e95aa21ed39389d2e6dccea6057c360acc00434..4271d2a996c1f87ed3ba6f9509223433edab5119 100644
--- a/ldapdump/locale/es/fusiondirectory.po
+++ b/ldapdump/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ldapdump/locale/es_CO/fusiondirectory.po b/ldapdump/locale/es_CO/fusiondirectory.po
index f78ce2f0956f28341ee6b1da5cdedde91eb54b8e..2685704294ad446f15d1541742db6cfc04504573 100644
--- a/ldapdump/locale/es_CO/fusiondirectory.po
+++ b/ldapdump/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapdump/locale/es_VE/fusiondirectory.po b/ldapdump/locale/es_VE/fusiondirectory.po
index e139f8d943c9ed3e63fee0727fe17cbbf693f6d4..4739db7129fd7c8735a6524478e23d855a2ef767 100644
--- a/ldapdump/locale/es_VE/fusiondirectory.po
+++ b/ldapdump/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ldapdump/locale/fa_IR/fusiondirectory.po b/ldapdump/locale/fa_IR/fusiondirectory.po
index e9e78663e74a8230856a35e99061414b3198fd23..236b11ee38f4e1dd4be8235bfb93c7b5ae28bff3 100644
--- a/ldapdump/locale/fa_IR/fusiondirectory.po
+++ b/ldapdump/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: addons/ldapdump/class_ldapDump.inc:26
 msgid "LDAP"
diff --git a/ldapdump/locale/fi_FI/fusiondirectory.po b/ldapdump/locale/fi_FI/fusiondirectory.po
index 0d2861d3055e75ceb26b800182c02f4008e5cd64..e9723e989e9cb8c96041e09c5e28f8fa8a3e5b7d 100644
--- a/ldapdump/locale/fi_FI/fusiondirectory.po
+++ b/ldapdump/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapdump/locale/fr/fusiondirectory.po b/ldapdump/locale/fr/fusiondirectory.po
index 355b4cc207a8b30386f2e20e3e6b4a3bfcdb6cfa..a2d427ea17d7b9311fd0524bb02f4221248440af 100644
--- a/ldapdump/locale/fr/fusiondirectory.po
+++ b/ldapdump/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/ldapdump/locale/hu_HU/fusiondirectory.po b/ldapdump/locale/hu_HU/fusiondirectory.po
index 4dcb941c92f543570f7b5e83b8081d54c0694871..c7e57a7fe04daed3c7ded913bc9f7f3789a9b983 100644
--- a/ldapdump/locale/hu_HU/fusiondirectory.po
+++ b/ldapdump/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapdump/locale/id/fusiondirectory.po b/ldapdump/locale/id/fusiondirectory.po
index 76dd8c98526d88c993abe542006556cd8dd8185d..9dc35c461f17e7c51f2f82c148125b82006238ed 100644
--- a/ldapdump/locale/id/fusiondirectory.po
+++ b/ldapdump/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapdump/locale/it_IT/fusiondirectory.po b/ldapdump/locale/it_IT/fusiondirectory.po
index 826e9bb89b8f4072a8b177d327f8a75261d87092..d895b8396a2b1ad02eb4775ef4d910b7cc8a13ee 100644
--- a/ldapdump/locale/it_IT/fusiondirectory.po
+++ b/ldapdump/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/ldapdump/locale/ja/fusiondirectory.po b/ldapdump/locale/ja/fusiondirectory.po
index 2cb3a4e90283d2016f0312750fd5c82af0e9da1e..ed61f4d135817e6058f1143e9d1449811646cd23 100644
--- a/ldapdump/locale/ja/fusiondirectory.po
+++ b/ldapdump/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapdump/locale/ko/fusiondirectory.po b/ldapdump/locale/ko/fusiondirectory.po
index 1d39fea11d66bc9ba817cd40a70cec4e2849b748..a4bd5544aea31c967e286028aeb55b12b73b25a9 100644
--- a/ldapdump/locale/ko/fusiondirectory.po
+++ b/ldapdump/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/ldapdump/locale/lv/fusiondirectory.po b/ldapdump/locale/lv/fusiondirectory.po
index c7fffe00233d036d715b8f9af21c21fa2b9c0c4d..6b11e3133c338db5907554e0c7de261cb8f1b558 100644
--- a/ldapdump/locale/lv/fusiondirectory.po
+++ b/ldapdump/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapdump/locale/nb/fusiondirectory.po b/ldapdump/locale/nb/fusiondirectory.po
index 86331cbd8d2823897664927dedcd336e21fc2c0e..a969e49549841b6fce027e15c743b4aaa9a25535 100644
--- a/ldapdump/locale/nb/fusiondirectory.po
+++ b/ldapdump/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapdump/locale/nl/fusiondirectory.po b/ldapdump/locale/nl/fusiondirectory.po
index e8944c91078f1c7470a322bc1c1f8fb07b7c14f7..cd8089f0afa2c375d402628910d4041b4aaf35ad 100644
--- a/ldapdump/locale/nl/fusiondirectory.po
+++ b/ldapdump/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Lucien Antonissen <lucien.antonissen@digipolis.be>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/ldapdump/locale/pl/fusiondirectory.po b/ldapdump/locale/pl/fusiondirectory.po
index 9c977f525cd782dd14fcaa77cb1145f5ef2d6357..a4d72839d4c8446df055e9a72529f391670a90f0 100644
--- a/ldapdump/locale/pl/fusiondirectory.po
+++ b/ldapdump/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ldapdump/locale/pt/fusiondirectory.po b/ldapdump/locale/pt/fusiondirectory.po
index 67784beef5ff4035685c27e949f44ded6e0a62a5..e093aa562f5684255b2c92b1d427bb20ec40817e 100644
--- a/ldapdump/locale/pt/fusiondirectory.po
+++ b/ldapdump/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapdump/locale/pt_BR/fusiondirectory.po b/ldapdump/locale/pt_BR/fusiondirectory.po
index 8c8372790332aafe45de6b74a79c3fddaa481307..93e6ae8a8688a712e2234473daccf3a534a58efb 100644
--- a/ldapdump/locale/pt_BR/fusiondirectory.po
+++ b/ldapdump/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ldapdump/locale/ru/fusiondirectory.po b/ldapdump/locale/ru/fusiondirectory.po
index fb4ead950ff473f6102abac7450ea44aff50930c..101ac99acb50899daeade3f822c01ae1d7de3656 100644
--- a/ldapdump/locale/ru/fusiondirectory.po
+++ b/ldapdump/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ldapdump/locale/ru@petr1708/fusiondirectory.po b/ldapdump/locale/ru@petr1708/fusiondirectory.po
index cda17719300485059b5d11bf2a68d64d59c08832..843d8014915701fcb62bd1d8e6c6357749451337 100644
--- a/ldapdump/locale/ru@petr1708/fusiondirectory.po
+++ b/ldapdump/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapdump/locale/sv/fusiondirectory.po b/ldapdump/locale/sv/fusiondirectory.po
index 8c87fbbd1c7c9dfb298721e34ef4e5801e5a4ffc..bdd6eb182ef257a7dca6103638669f9e21e23708 100644
--- a/ldapdump/locale/sv/fusiondirectory.po
+++ b/ldapdump/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ldapdump/locale/tr_TR/fusiondirectory.po b/ldapdump/locale/tr_TR/fusiondirectory.po
index 86a480a5221a27e50ccd9545a109f2107c41f987..c962bfeae5c6581889ff73053ec1a6842f7d7f32 100644
--- a/ldapdump/locale/tr_TR/fusiondirectory.po
+++ b/ldapdump/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapdump/locale/ug/fusiondirectory.po b/ldapdump/locale/ug/fusiondirectory.po
index 64cbfb7cac6f4ebbd9cad6445a56054889ab7a73..d5b02f5790c16a945d76932929d8e17fef146426 100644
--- a/ldapdump/locale/ug/fusiondirectory.po
+++ b/ldapdump/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapdump/locale/vi_VN/fusiondirectory.po b/ldapdump/locale/vi_VN/fusiondirectory.po
index 5e2eb2a7eaab624bb516ebb7fae3ba60a9dab1d4..afbb1d200ebdbf7fcc77fe1b05357376628c1bfd 100644
--- a/ldapdump/locale/vi_VN/fusiondirectory.po
+++ b/ldapdump/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/ldapdump/locale/zh/fusiondirectory.po b/ldapdump/locale/zh/fusiondirectory.po
index c4acb06b40438cca8c361b806a8309fcdcc24cfb..f00c83b1b3223369dee1f27e840c24d16240a163 100644
--- a/ldapdump/locale/zh/fusiondirectory.po
+++ b/ldapdump/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapdump/locale/zh_TW/fusiondirectory.po b/ldapdump/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..6a4492bbd45a12032123de27b500e73499fb3abf
--- /dev/null
+++ b/ldapdump/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,30 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: addons/ldapdump/class_ldapDump.inc:26
+msgid "LDAP"
+msgstr ""
+
+#: addons/ldapdump/class_ldapDump.inc:27 addons/ldapdump/class_ldapDump.inc:39
+msgid "LDAP Dump"
+msgstr ""
+
+#: addons/ldapdump/ldapdump.tpl.c:2
+msgid "Insufficient rights"
+msgstr ""
diff --git a/ldapmanager/locale/af_ZA/fusiondirectory.po b/ldapmanager/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..161871928fd23ffd0ea477e846a393bc735e016e
--- /dev/null
+++ b/ldapmanager/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,207 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: addons/ldapmanager/tabs_ldif.inc:31
+msgid "LDAP import/export"
+msgstr ""
+
+#: addons/ldapmanager/tabs_ldif.inc:32
+msgid "Allows the import or export of the ldap tree"
+msgstr ""
+
+#: addons/ldapmanager/tabs_ldif.inc:36
+msgid "Ldap manager"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:45
+msgid "LDIF"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:46
+msgid "Export/Import the ldap tree to/from LDIF format"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:48
+msgid "LDAP Manager"
+msgstr ""
+
+#: 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:64
+msgid "DN of a single entry to export as ldif"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:78
+msgid "Export single entry"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:81
+msgid "Filter"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:81
+msgid "Filter to use for selecting objects to export"
+msgstr ""
+
+#: 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:98
+msgid "Export complete LDIF for"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:103
+msgid "Import LDIF"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:106
+msgid "Overwrite existing entries"
+msgstr ""
+
+#: 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: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:121
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
+msgid "Import"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:125
+msgid "Import LDIF file"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
+msgid "LDAP error"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#, php-format
+msgid "No such object %s!"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:174
+msgid "Permission error"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:175
+#, php-format
+msgid "You have no permission to export %s!"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:181
+msgid "Error"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:182
+#, php-format
+msgid "Failed to generate ldap export, error was \"%s\"!"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:29
+msgid "CSV import"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:30
+msgid "Import of csv data into the ldap tree"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:43
+msgid "Import CSV"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Object type"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Type of objects you wish to import"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Template"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Select a template to apply to imported entries"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "CSV file"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "Import a CSV file into your LDAP"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Separator"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Character used as separator in the CSV file"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:72
+msgid "Fixed values"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:72
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:88
+msgid "Template filling"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:97
+msgid "Select fields associations"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:243
+#, php-format
+msgid "Import failed for line %d"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:250
+msgid "Success"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:250
+#, php-format
+msgid "Successfully imported %d entries"
+msgstr ""
diff --git a/ldapmanager/locale/ar/fusiondirectory.po b/ldapmanager/locale/ar/fusiondirectory.po
index d1b6f5d139b5d879d8d81e59c6c4baa04694e7a2..2206777ab74c65b5fd3a70b90ad43f5a3e23620a 100644
--- a/ldapmanager/locale/ar/fusiondirectory.po
+++ b/ldapmanager/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/ldapmanager/locale/ca/fusiondirectory.po b/ldapmanager/locale/ca/fusiondirectory.po
index 6f6b5585ac8c1fee6c73f797b822cc6b2eb66643..288c5fd221b8a7edc51d967e65cc7434d4d5c2fa 100644
--- a/ldapmanager/locale/ca/fusiondirectory.po
+++ b/ldapmanager/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/ldapmanager/locale/cs_CZ/fusiondirectory.po b/ldapmanager/locale/cs_CZ/fusiondirectory.po
index 1c0493218aa48f6ceecf28eba6744e4d30af74a4..0ba2a0033d7c193fd2749b4cc1b17bf5fd191396 100644
--- a/ldapmanager/locale/cs_CZ/fusiondirectory.po
+++ b/ldapmanager/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: addons/ldapmanager/tabs_ldif.inc:31
 msgid "LDAP import/export"
diff --git a/ldapmanager/locale/de/fusiondirectory.po b/ldapmanager/locale/de/fusiondirectory.po
index 8503f13d171ecc19d3dedadd9bf2fc7b6fe6c3f6..b63b0dafc769d33f38ddabed58ce1049abdb9ea6 100644
--- a/ldapmanager/locale/de/fusiondirectory.po
+++ b/ldapmanager/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ldapmanager/locale/el_GR/fusiondirectory.po b/ldapmanager/locale/el_GR/fusiondirectory.po
index 007ffc9e745ce2c9fd8e43b55ea0ee2301501ee6..bd3fcd844059a3167d167263a68d7910624d0be2 100644
--- a/ldapmanager/locale/el_GR/fusiondirectory.po
+++ b/ldapmanager/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ldapmanager/locale/es/fusiondirectory.po b/ldapmanager/locale/es/fusiondirectory.po
index 23c4229ff4a26f7124f7ba9217c86378756750e9..5914441d1938565bbb054108f505d6602ea192b5 100644
--- a/ldapmanager/locale/es/fusiondirectory.po
+++ b/ldapmanager/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ldapmanager/locale/es_CO/fusiondirectory.po b/ldapmanager/locale/es_CO/fusiondirectory.po
index 9edc14664ca9e5d5f8ad265417c502e2ad7647f5..c66e1d32f41b78f1b700880c6724815ec8c38c48 100644
--- a/ldapmanager/locale/es_CO/fusiondirectory.po
+++ b/ldapmanager/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ldapmanager/locale/es_VE/fusiondirectory.po b/ldapmanager/locale/es_VE/fusiondirectory.po
index 90490d070d3398134d3fcdb2a56d87141247a528..04b64fad95ad09e9206eaf3e01dd1bb46e0d57cc 100644
--- a/ldapmanager/locale/es_VE/fusiondirectory.po
+++ b/ldapmanager/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ldapmanager/locale/fa_IR/fusiondirectory.po b/ldapmanager/locale/fa_IR/fusiondirectory.po
index d5f80e3bc64fcced60dfe052f9af8ef69e3d379c..2818c02dfa3aebc664693ca7ac03dd91906323f0 100644
--- a/ldapmanager/locale/fa_IR/fusiondirectory.po
+++ b/ldapmanager/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa_IR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: addons/ldapmanager/tabs_ldif.inc:31
 msgid "LDAP import/export"
diff --git a/ldapmanager/locale/fi_FI/fusiondirectory.po b/ldapmanager/locale/fi_FI/fusiondirectory.po
index 295fd2e85ebd386d6a77f4098dd93f343b8e1618..9c782bc2c52595d00355715009bfde9912c1358f 100644
--- a/ldapmanager/locale/fi_FI/fusiondirectory.po
+++ b/ldapmanager/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/ldapmanager/locale/fr/fusiondirectory.po b/ldapmanager/locale/fr/fusiondirectory.po
index 20ce0b699f88390fe04e2c237e65e71799ce48c4..6f3b5701f7b2ccf9b351a349bb3a88eb30889340 100644
--- a/ldapmanager/locale/fr/fusiondirectory.po
+++ b/ldapmanager/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/ldapmanager/locale/hu_HU/fusiondirectory.po b/ldapmanager/locale/hu_HU/fusiondirectory.po
index 9fd0f7cffa88cf69b97c420e895f1b86a7f0950f..8fe9340704108c6289afc0b5cb2a30a8bdc54d01 100644
--- a/ldapmanager/locale/hu_HU/fusiondirectory.po
+++ b/ldapmanager/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapmanager/locale/id/fusiondirectory.po b/ldapmanager/locale/id/fusiondirectory.po
index e453625d608f78212446f42bb338a7aec1b6688a..eb45757ff130b8006fef3dd519e289cd26a3438e 100644
--- a/ldapmanager/locale/id/fusiondirectory.po
+++ b/ldapmanager/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapmanager/locale/it_IT/fusiondirectory.po b/ldapmanager/locale/it_IT/fusiondirectory.po
index 4283b3c3d3d02d6aa6a054ac9a8bf7dff03fbf6b..ecea7c0a558d7ae11de41b59a816e5525366a53a 100644
--- a/ldapmanager/locale/it_IT/fusiondirectory.po
+++ b/ldapmanager/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/ldapmanager/locale/ja/fusiondirectory.po b/ldapmanager/locale/ja/fusiondirectory.po
index 55c77b1474e9d2bd0e4373eda8e89fbb37036313..3556ab35244367c2108f730e1e3450c53732776a 100644
--- a/ldapmanager/locale/ja/fusiondirectory.po
+++ b/ldapmanager/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapmanager/locale/ko/fusiondirectory.po b/ldapmanager/locale/ko/fusiondirectory.po
index 1aa011d090dd82dbc09072d325bf9696d8fe1f92..b93ed02e60cc5c3cf206cce55268b78c63f1bde6 100644
--- a/ldapmanager/locale/ko/fusiondirectory.po
+++ b/ldapmanager/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
@@ -20,41 +20,41 @@ msgstr ""
 
 #: addons/ldapmanager/tabs_ldif.inc:31
 msgid "LDAP import/export"
-msgstr ""
+msgstr "LDAP 가져오기 / 내보내기"
 
 #: addons/ldapmanager/tabs_ldif.inc:32
 msgid "Allows the import or export of the ldap tree"
-msgstr ""
+msgstr "LDAP 트리 가져오기 또는 내보내기 허용"
 
 #: addons/ldapmanager/tabs_ldif.inc:36
 msgid "Ldap manager"
-msgstr ""
+msgstr "Ldap 관리자"
 
 #: 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"
-msgstr ""
+msgstr "LDIF 형식으로 /에서 LDIF 트리 내보내기 / 가져오기"
 
 #: addons/ldapmanager/class_ldapmanager.inc:48
 msgid "LDAP Manager"
-msgstr ""
+msgstr "LDAP 관리자"
 
 #: addons/ldapmanager/class_ldapmanager.inc:61
 #: addons/ldapmanager/class_ldapmanager.inc:74
 #: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
-msgstr ""
+msgstr "내보내기"
 
 #: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
-msgstr ""
+msgstr "ldif로 내보낼 단일 항목의 DN"
 
 #: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
-msgstr ""
+msgstr "단일 항목 내보내기"
 
 #: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
@@ -62,37 +62,39 @@ msgstr "í•„í„°"
 
 #: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
-msgstr ""
+msgstr "내보낼 개체 선택에 사용할 필터"
 
 #: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
-msgstr ""
+msgstr "이 base에 대해 실행중인 LDAP 디렉토리의 전체 스냅 샷을 ldif로 다운로드"
 
 #: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
-msgstr ""
+msgstr "LDIF에 대한 전체 내보내기"
 
 #: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
-msgstr ""
+msgstr "LDIF 가져오기"
 
 #: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
-msgstr ""
+msgstr "기존 항목 덮어쓰기"
 
 #: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
-msgstr ""
+msgstr "LDIF에 없는 필드를 기존 LDAP 항목에서 제거합니다."
 
 #: 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를 준수하는지 확인하지 "
+"않습니다."
 
 #: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/class_csvimport.inc:81
@@ -102,7 +104,7 @@ msgstr "임포트"
 
 #: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
-msgstr ""
+msgstr "LDIF 파일 가져오기"
 
 #: addons/ldapmanager/class_ldapmanager.inc:153
 #: addons/ldapmanager/class_ldapmanager.inc:198
@@ -112,16 +114,16 @@ msgstr "lDAP 오류"
 #: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
-msgstr ""
+msgstr "그런 개체가 없습니다 %s!"
 
 #: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
-msgstr ""
+msgstr "권한 오류"
 
 #: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
-msgstr ""
+msgstr "1%s을(를) 내보낼 권한이 없습니다!"
 
 #: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
@@ -130,19 +132,19 @@ msgstr "오류"
 #: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
-msgstr ""
+msgstr "LDAP 내보내기를 생성하지 못했습니다. 오류는 \"%s\"입니다!"
 
 #: addons/ldapmanager/class_csvimport.inc:29
 msgid "CSV import"
-msgstr ""
+msgstr "CSV 내보내기"
 
 #: addons/ldapmanager/class_csvimport.inc:30
 msgid "Import of csv data into the ldap tree"
-msgstr ""
+msgstr "Import of csv data into the ldap tree"
 
 #: addons/ldapmanager/class_csvimport.inc:43
 msgid "Import CSV"
-msgstr ""
+msgstr "CSV 가져오기"
 
 #: addons/ldapmanager/class_csvimport.inc:46
 msgid "Object type"
@@ -150,53 +152,53 @@ msgstr "오브젝트 타입"
 
 #: addons/ldapmanager/class_csvimport.inc:46
 msgid "Type of objects you wish to import"
-msgstr ""
+msgstr "가져올 개체 유형"
 
 #: addons/ldapmanager/class_csvimport.inc:52
 msgid "Template"
-msgstr ""
+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"
-msgstr ""
+msgstr "CSV 파일"
 
 #: addons/ldapmanager/class_csvimport.inc:58
 msgid "Import a CSV file into your LDAP"
-msgstr ""
+msgstr "LDAP에 CSV 파일 가져오기"
 
 #: addons/ldapmanager/class_csvimport.inc:62
 msgid "Separator"
-msgstr ""
+msgstr "구분자"
 
 #: addons/ldapmanager/class_csvimport.inc:62
 msgid "Character used as separator in the CSV file"
-msgstr ""
+msgstr "CSV 파일에서 구분자로 사용되는 문자"
 
 #: addons/ldapmanager/class_csvimport.inc:72
 msgid "Fixed values"
-msgstr ""
+msgstr "ê³ ì •ê°’"
 
 #: addons/ldapmanager/class_csvimport.inc:72
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
-msgstr ""
+msgstr "템플릿 작성 시 사용할 수 있는 고정값입니다."
 
 #: addons/ldapmanager/class_csvimport.inc:88
 msgid "Template filling"
-msgstr ""
+msgstr "템플릿 채우기"
 
 #: addons/ldapmanager/class_csvimport.inc:97
 msgid "Select fields associations"
-msgstr ""
+msgstr "필드 연결 선택"
 
 #: addons/ldapmanager/class_csvimport.inc:243
 #, php-format
 msgid "Import failed for line %d"
-msgstr ""
+msgstr "%d 행에 대한 가져오기가 실패했습니다."
 
 #: addons/ldapmanager/class_csvimport.inc:250
 msgid "Success"
@@ -205,4 +207,4 @@ msgstr "성공"
 #: addons/ldapmanager/class_csvimport.inc:250
 #, php-format
 msgid "Successfully imported %d entries"
-msgstr ""
+msgstr "%d 개 항목을 성공적으로 가져왔습니다."
diff --git a/ldapmanager/locale/lv/fusiondirectory.po b/ldapmanager/locale/lv/fusiondirectory.po
index 4bb05f11a623df04c3ca9d47e65955514ff49bdf..9657874084d225f41bf24033ebefea016f4517e3 100644
--- a/ldapmanager/locale/lv/fusiondirectory.po
+++ b/ldapmanager/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/ldapmanager/locale/nb/fusiondirectory.po b/ldapmanager/locale/nb/fusiondirectory.po
index e514980807e75096df4c5806e07f50b38eb82056..8bc810be6e35487f81df14904c47c9f289abf019 100644
--- a/ldapmanager/locale/nb/fusiondirectory.po
+++ b/ldapmanager/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/ldapmanager/locale/nl/fusiondirectory.po b/ldapmanager/locale/nl/fusiondirectory.po
index 701778b2079ea8590d594d497473adc2fd83b952..3326a01007c8a46c86e4360bc4e497c1d382e23a 100644
--- a/ldapmanager/locale/nl/fusiondirectory.po
+++ b/ldapmanager/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/ldapmanager/locale/pl/fusiondirectory.po b/ldapmanager/locale/pl/fusiondirectory.po
index c5326bde7ec92703c5a0e79f66af9465439d1bc1..93f5d2668a22259f9e3e0f36ba91e1a323b799c4 100644
--- a/ldapmanager/locale/pl/fusiondirectory.po
+++ b/ldapmanager/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ldapmanager/locale/pt/fusiondirectory.po b/ldapmanager/locale/pt/fusiondirectory.po
index 0086aa1fecdc916181d51a29584d7216691ea2ac..8024c559c228bdff848a517b4e17c5642b8afcb5 100644
--- a/ldapmanager/locale/pt/fusiondirectory.po
+++ b/ldapmanager/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/ldapmanager/locale/pt_BR/fusiondirectory.po b/ldapmanager/locale/pt_BR/fusiondirectory.po
index cf73e30cb2b722ead85d388147fbfe3320e0f9e9..e1fc4ba6c8004af5caf94d659e437ddcfc99a17a 100644
--- a/ldapmanager/locale/pt_BR/fusiondirectory.po
+++ b/ldapmanager/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ldapmanager/locale/ru/fusiondirectory.po b/ldapmanager/locale/ru/fusiondirectory.po
index 03a2db05e37cac1eb150103d19b15a609c26932e..01c30f54821c875b146feb8670274cf753eecf92 100644
--- a/ldapmanager/locale/ru/fusiondirectory.po
+++ b/ldapmanager/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ldapmanager/locale/ru@petr1708/fusiondirectory.po b/ldapmanager/locale/ru@petr1708/fusiondirectory.po
index 0d2c45b30ac501dd0de8b2fd00266aa8790bd9a0..8c1b4716c40512aff68a477aed5ce68952cc8ddc 100644
--- a/ldapmanager/locale/ru@petr1708/fusiondirectory.po
+++ b/ldapmanager/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapmanager/locale/sv/fusiondirectory.po b/ldapmanager/locale/sv/fusiondirectory.po
index d493ad9e7f90b8dd491bdb33d856ff25fe36d013..25a241d56a76b43b0b1054be02c2396fb1baed18 100644
--- a/ldapmanager/locale/sv/fusiondirectory.po
+++ b/ldapmanager/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ldapmanager/locale/tr_TR/fusiondirectory.po b/ldapmanager/locale/tr_TR/fusiondirectory.po
index bdb2dc49bc8cccfaf06034398a79b9a3efd961df..45307d0e94109b2a078ec2fc0f9f6a582f70bbcc 100644
--- a/ldapmanager/locale/tr_TR/fusiondirectory.po
+++ b/ldapmanager/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapmanager/locale/ug/fusiondirectory.po b/ldapmanager/locale/ug/fusiondirectory.po
index c72e35e80e85f04a4fd5be4976a5aa27e7fff82e..438014a5596eaca9366c6f9cac0b49aba97b0c00 100644
--- a/ldapmanager/locale/ug/fusiondirectory.po
+++ b/ldapmanager/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ldapmanager/locale/vi_VN/fusiondirectory.po b/ldapmanager/locale/vi_VN/fusiondirectory.po
index fdfa598890e332454409a5493f9882fd142c0a7b..bd7b8786905d0353f4ee1485c625fb4a4ada8f2e 100644
--- a/ldapmanager/locale/vi_VN/fusiondirectory.po
+++ b/ldapmanager/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/ldapmanager/locale/zh/fusiondirectory.po b/ldapmanager/locale/zh/fusiondirectory.po
index 61fb3d01b3a05479ae3d98c4ec439808d1ef8088..92dc22c94d7380013fbbb3436dab9e876264a1fd 100644
--- a/ldapmanager/locale/zh/fusiondirectory.po
+++ b/ldapmanager/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ldapmanager/locale/zh_TW/fusiondirectory.po b/ldapmanager/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..48b5fc3b0703ce791402ded6c4a2e0d491e2ddc0
--- /dev/null
+++ b/ldapmanager/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,207 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: addons/ldapmanager/tabs_ldif.inc:31
+msgid "LDAP import/export"
+msgstr ""
+
+#: addons/ldapmanager/tabs_ldif.inc:32
+msgid "Allows the import or export of the ldap tree"
+msgstr ""
+
+#: addons/ldapmanager/tabs_ldif.inc:36
+msgid "Ldap manager"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:45
+msgid "LDIF"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:46
+msgid "Export/Import the ldap tree to/from LDIF format"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:48
+msgid "LDAP Manager"
+msgstr ""
+
+#: 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:64
+msgid "DN of a single entry to export as ldif"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:78
+msgid "Export single entry"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:81
+msgid "Filter"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:81
+msgid "Filter to use for selecting objects to export"
+msgstr ""
+
+#: 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:98
+msgid "Export complete LDIF for"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:103
+msgid "Import LDIF"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:106
+msgid "Overwrite existing entries"
+msgstr ""
+
+#: 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: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:121
+#: addons/ldapmanager/class_csvimport.inc:81
+#: addons/ldapmanager/class_csvimport.inc:107
+msgid "Import"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:125
+msgid "Import LDIF file"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
+msgid "LDAP error"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:154
+#, php-format
+msgid "No such object %s!"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:174
+msgid "Permission error"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:175
+#, php-format
+msgid "You have no permission to export %s!"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:181
+msgid "Error"
+msgstr ""
+
+#: addons/ldapmanager/class_ldapmanager.inc:182
+#, php-format
+msgid "Failed to generate ldap export, error was \"%s\"!"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:29
+msgid "CSV import"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:30
+msgid "Import of csv data into the ldap tree"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:43
+msgid "Import CSV"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Object type"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:46
+msgid "Type of objects you wish to import"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Template"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:52
+msgid "Select a template to apply to imported entries"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "CSV file"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:58
+msgid "Import a CSV file into your LDAP"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Separator"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:62
+msgid "Character used as separator in the CSV file"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:72
+msgid "Fixed values"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:72
+msgid ""
+"Some fixed values that you might wanna use in the filling of the template."
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:88
+msgid "Template filling"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:97
+msgid "Select fields associations"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:243
+#, php-format
+msgid "Import failed for line %d"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:250
+msgid "Success"
+msgstr ""
+
+#: addons/ldapmanager/class_csvimport.inc:250
+#, php-format
+msgid "Successfully imported %d entries"
+msgstr ""
diff --git a/mail/locale/af_ZA/fusiondirectory.po b/mail/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..e19bc9fe05b8165485abfb3eccd39476d762c124
--- /dev/null
+++ b/mail/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,319 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/groups/mail/class_mailGroup.inc:46
+#: config/mail/class_mailPluginConfig.inc:28
+#: personal/mail/class_mailAccount.inc:73
+msgid "Mail"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:47
+msgid "Group mail options"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:59
+msgid "Information"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:62
+#: personal/mail/class_mailAccount.inc:99
+msgid "Primary address"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:62
+msgid "The primary mail address"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:66
+#: personal/mail/class_mailAccount.inc:103
+msgid "Server"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:72
+#: personal/mail/class_mailAccount.inc:119
+msgid "Alternative addresses"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:77
+msgid "Forward messages to non group members"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:81
+msgid "Only allowed to receive local mail"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:159
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:162
+#: personal/mail/class_mailAccount.inc:326
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
+#: personal/mail/class_mailAccount.inc:45
+#: 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 ""
+
+#: admin/groups/mail/class_mailGroup.inc:183
+#: personal/mail/class_mailAccount.inc:369
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:187
+#: personal/mail/class_mailAccount.inc:373
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:29
+msgid "Mail plugin configuration"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:41
+#: personal/mail/class_mailAccount.inc:74
+msgid "Mail settings"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:44
+msgid "Account identification attribute"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:45
+msgid "Which attribute will be used to create accounts."
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:50
+msgid "Mail user template"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:51
+msgid "Override the user account creation syntax."
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:55
+msgid "Mail folder template"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:56
+msgid "Override the methods default account creation syntax."
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:60
+msgid "Use cyrus UNIX style"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:61
+msgid ""
+"Determines if 'foo/bar' or 'foo.bar' should be uses as namespaces in IMAP."
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:65
+msgid "Delete mailbox on account deletion"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:66
+msgid ""
+"Determines if the mailbox should be removed from your IMAP server after the "
+"account is deleted in LDAP."
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:71
+msgid "Cyrus autocreate folders"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:72
+msgid ""
+"List of personal IMAP folders that should be created along initial account "
+"creation."
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:77
+msgid "IMAP timeout"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:78
+msgid "Sets the connection timeout for imap actions."
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:83
+msgid "Shared prefix"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:84
+msgid "Prefix to add for mail shared folders."
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:45
+#, php-format
+msgid "Cannot read quota settings: %s"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:55
+msgid "Quota usage"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:56
+msgid "Part of the quota which is used"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:96
+msgid "Mail account"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:99
+msgid "Primary mail address"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:103
+msgid "Specify the mail server where the user will be hosted on"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:108
+msgid "Quota size"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:115
+msgid "Other addresses and redirections"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:119
+msgid "List of alternative mail addresses"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:124
+msgid "Forward messages to"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:124
+msgid "Addresses to which messages should be forwarded"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
+msgid "Vacation message"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:133
+msgid "Activate vacation message"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:134
+msgid ""
+"Select to automatically response with the vacation message defined below"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:139
+msgid "from"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:144
+msgid "till"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:155
+msgid "Advanced mail options"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:163
+msgid "User is only allowed to send and receive local mails"
+msgstr ""
+
+#: 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:169
+msgid "No delivery to own mailbox"
+msgstr ""
+
+#: 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:261
+#, php-format
+msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:329
+#, php-format
+msgid "Cannot write quota settings: %s"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:144
+msgid "Configuration error"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:145
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:703
+msgid "Unknown"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:705
+msgid "Unlimited"
+msgstr ""
diff --git a/mail/locale/ar/fusiondirectory.po b/mail/locale/ar/fusiondirectory.po
index e3a999ca52ba741996db7606ef7117144ba66f00..ac6d23a38ad268e49c5f6885f6fffccf471adf68 100644
--- a/mail/locale/ar/fusiondirectory.po
+++ b/mail/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/mail/locale/ca/fusiondirectory.po b/mail/locale/ca/fusiondirectory.po
index 4b70b952fc6d23f5ad4c318e212651fccc0509d9..f5c687fce377f501fa00a70b7c1bb5a655f8dee2 100644
--- a/mail/locale/ca/fusiondirectory.po
+++ b/mail/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/mail/locale/cs_CZ/fusiondirectory.po b/mail/locale/cs_CZ/fusiondirectory.po
index 81223dd9fcccbd36d4120d0c7bf47e6aef18247b..05e78dc8712633ab0d0b0b9fc45ac438f9a7bd4b 100644
--- a/mail/locale/cs_CZ/fusiondirectory.po
+++ b/mail/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/groups/mail/class_mailGroup.inc:46
 #: config/mail/class_mailPluginConfig.inc:28
diff --git a/mail/locale/de/fusiondirectory.po b/mail/locale/de/fusiondirectory.po
index cd0f7c4c72666dab13bd9c1e123e9f69087afbb8..fc02e8b029790b7b666dbd763e70d45064f5da9f 100644
--- a/mail/locale/de/fusiondirectory.po
+++ b/mail/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/mail/locale/el_GR/fusiondirectory.po b/mail/locale/el_GR/fusiondirectory.po
index be1677cfbcff10b26dc331991b6c2e7db3124d56..34dd1f8212a79fa9d8c3b65e29ffb2a870b1f11e 100644
--- a/mail/locale/el_GR/fusiondirectory.po
+++ b/mail/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/mail/locale/es/fusiondirectory.po b/mail/locale/es/fusiondirectory.po
index 3309c5d36f1a44f86a6407cc38164940d1cb8443..04543e948637c24bb13ef33d0bc2d3707b604df6 100644
--- a/mail/locale/es/fusiondirectory.po
+++ b/mail/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/mail/locale/es_CO/fusiondirectory.po b/mail/locale/es_CO/fusiondirectory.po
index d51f024939d0806e477d7964d159448c760b748f..ea2aaeb3b20968696e2348dfb03f250ea335c129 100644
--- a/mail/locale/es_CO/fusiondirectory.po
+++ b/mail/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/mail/locale/es_VE/fusiondirectory.po b/mail/locale/es_VE/fusiondirectory.po
index b955c9e4fb47f5be6544e334b484cb9a5af6d327..8be9691f15583247dd98181cbbf4ca81d9c8492e 100644
--- a/mail/locale/es_VE/fusiondirectory.po
+++ b/mail/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/mail/locale/fa_IR/fusiondirectory.po b/mail/locale/fa_IR/fusiondirectory.po
index 278de9de0ff40c7a0fe7b4350e62a03d9542121a..365c1b8d780071c462965a6dc72b770f56a66b35 100644
--- a/mail/locale/fa_IR/fusiondirectory.po
+++ b/mail/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/groups/mail/class_mailGroup.inc:46
 #: config/mail/class_mailPluginConfig.inc:28
diff --git a/mail/locale/fi_FI/fusiondirectory.po b/mail/locale/fi_FI/fusiondirectory.po
index 73a40ab98ffcd5f3db73626bd153cb27a32d1e99..b92b63505d915a151320af71afc24e71867c0c12 100644
--- a/mail/locale/fi_FI/fusiondirectory.po
+++ b/mail/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/mail/locale/fr/fusiondirectory.po b/mail/locale/fr/fusiondirectory.po
index 95cd5c9be0779032c1dd73c74259eb37edd02055..26e8401726a95e09403cb53bee0d1831e0b0d07c 100644
--- a/mail/locale/fr/fusiondirectory.po
+++ b/mail/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/mail/locale/hu_HU/fusiondirectory.po b/mail/locale/hu_HU/fusiondirectory.po
index 23c5cffbb8d7580c73dc1a4cc7d41f1987b8a7da..2ed2ba8b7978458b47da425970a0fd68fd5d9003 100644
--- a/mail/locale/hu_HU/fusiondirectory.po
+++ b/mail/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/mail/locale/id/fusiondirectory.po b/mail/locale/id/fusiondirectory.po
index 7d3b3554652c3de73503f4cfa75412a3c267e01d..9715c920ae300f309c5b1069b1c30ea43e766b35 100644
--- a/mail/locale/id/fusiondirectory.po
+++ b/mail/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/mail/locale/it_IT/fusiondirectory.po b/mail/locale/it_IT/fusiondirectory.po
index 50d0590373308c684660b98dd30508c583f52ce6..71d214c9ba32dbd477e6d59b30e73b647896d5a4 100644
--- a/mail/locale/it_IT/fusiondirectory.po
+++ b/mail/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/mail/locale/ja/fusiondirectory.po b/mail/locale/ja/fusiondirectory.po
index d74ca55fc85ddccfd772c7e17ae3d2815223f3ac..592fbcbbf2a7ac334eacd63f6cb6dfd9e361dce6 100644
--- a/mail/locale/ja/fusiondirectory.po
+++ b/mail/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/mail/locale/ko/fusiondirectory.po b/mail/locale/ko/fusiondirectory.po
index cfd37ada7996d65900608e8ad9ef0e6ac96b9ad3..3288e82f0bc31a724cbda3ce9c6581ee9e5edd59 100644
--- a/mail/locale/ko/fusiondirectory.po
+++ b/mail/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/mail/locale/lv/fusiondirectory.po b/mail/locale/lv/fusiondirectory.po
index f756d6b1f41425cfc8c3b0fc04ebeed44d6d4f82..c62f9989ae78cdf056de1570f46968bf3ae92903 100644
--- a/mail/locale/lv/fusiondirectory.po
+++ b/mail/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/mail/locale/nb/fusiondirectory.po b/mail/locale/nb/fusiondirectory.po
index c7d1038fa7a5f77cb80aa21e7aec24ba0e7af770..a209c9f5979e8db56145ec2abb0260ea1080c7e9 100644
--- a/mail/locale/nb/fusiondirectory.po
+++ b/mail/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/mail/locale/nl/fusiondirectory.po b/mail/locale/nl/fusiondirectory.po
index f4b1212abdc9a23aa59c274b5640bb13daccb7f1..622fe02905f8ce707c5981c5537f79c293e72067 100644
--- a/mail/locale/nl/fusiondirectory.po
+++ b/mail/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Rombout de Neef <rombout.deneef@digipolis.be>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/mail/locale/pl/fusiondirectory.po b/mail/locale/pl/fusiondirectory.po
index 6ca190581a5696d801960f47c4e359f03ae4a0a6..2cfd60af8c7310b55f76b1b212cd1bbdc1f3b3bb 100644
--- a/mail/locale/pl/fusiondirectory.po
+++ b/mail/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/mail/locale/pt/fusiondirectory.po b/mail/locale/pt/fusiondirectory.po
index 8f1470cfea7b48088a3e274b2c6b6f8936f8161c..276bf80a284391d2a1d7ad9d41039fb1986124b2 100644
--- a/mail/locale/pt/fusiondirectory.po
+++ b/mail/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/mail/locale/pt_BR/fusiondirectory.po b/mail/locale/pt_BR/fusiondirectory.po
index a43fdd4621fcefe29b077eaade05f148f93d901b..ba7ec8041daed4a75959aa5559bef4c9533728f7 100644
--- a/mail/locale/pt_BR/fusiondirectory.po
+++ b/mail/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/mail/locale/ru/fusiondirectory.po b/mail/locale/ru/fusiondirectory.po
index 3d2dd6d91e6bea8c941a8aa6ea0330e46ba09724..cd47f54642c2accbc1a5cffd00a410e9b5826e1b 100644
--- a/mail/locale/ru/fusiondirectory.po
+++ b/mail/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/mail/locale/ru@petr1708/fusiondirectory.po b/mail/locale/ru@petr1708/fusiondirectory.po
index d5e51e1bce09c72af69f2445103c835bf193c37d..5001c3ceb5e6b5cbd62e15f3d1c2b9e5a8aa186d 100644
--- a/mail/locale/ru@petr1708/fusiondirectory.po
+++ b/mail/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/mail/locale/sv/fusiondirectory.po b/mail/locale/sv/fusiondirectory.po
index 8cfd2298909b6a58420bbe5995f21cc249fa4e30..ac9e41363317f2fc53d12684843742e6fc84fdec 100644
--- a/mail/locale/sv/fusiondirectory.po
+++ b/mail/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/mail/locale/tr_TR/fusiondirectory.po b/mail/locale/tr_TR/fusiondirectory.po
index 8a21b467f33f72495c53910500108d606db8a95c..53cf73d4d262d59d4ea10cc05197dcabd9840610 100644
--- a/mail/locale/tr_TR/fusiondirectory.po
+++ b/mail/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/mail/locale/ug/fusiondirectory.po b/mail/locale/ug/fusiondirectory.po
index b83f953eb562bfa4e42c9ded5cc45147cd1f555b..98c95a41abdec89808c64e4ad6b00c50843dbe8c 100644
--- a/mail/locale/ug/fusiondirectory.po
+++ b/mail/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/mail/locale/vi_VN/fusiondirectory.po b/mail/locale/vi_VN/fusiondirectory.po
index 56982db4a3dc52739806c91fc397f57c0edd2f2d..ee7208e8a07ecf1041396ff070682e2669900bb2 100644
--- a/mail/locale/vi_VN/fusiondirectory.po
+++ b/mail/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/mail/locale/zh/fusiondirectory.po b/mail/locale/zh/fusiondirectory.po
index 82e5a855c241e72f1cc2db48c1dbdd3bfc68dacc..0923259808a5f357f5ed93e5eb9dbb1dd1458a13 100644
--- a/mail/locale/zh/fusiondirectory.po
+++ b/mail/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/mail/locale/zh_TW/fusiondirectory.po b/mail/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..d4f820ed8422d33e06b34e1a4894015af5009380
--- /dev/null
+++ b/mail/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,319 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/groups/mail/class_mailGroup.inc:46
+#: config/mail/class_mailPluginConfig.inc:28
+#: personal/mail/class_mailAccount.inc:73
+msgid "Mail"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:47
+msgid "Group mail options"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:59
+msgid "Information"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:62
+#: personal/mail/class_mailAccount.inc:99
+msgid "Primary address"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:62
+msgid "The primary mail address"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:66
+#: personal/mail/class_mailAccount.inc:103
+msgid "Server"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:66
+msgid "Email server"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:72
+#: personal/mail/class_mailAccount.inc:119
+msgid "Alternative addresses"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:72
+msgid "Alternative mail addresses for the group"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:77
+msgid "Forward messages to non group members"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:81
+msgid "Only allowed to receive local mail"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:81
+msgid ""
+"Whether this group mail is only allowed to receive messages from local "
+"senders"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:159
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:162
+#: personal/mail/class_mailAccount.inc:326
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:183
+#: admin/groups/mail/class_mailGroup.inc:187
+#: personal/mail/class_mailAccount.inc:45
+#: 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 ""
+
+#: admin/groups/mail/class_mailGroup.inc:183
+#: personal/mail/class_mailAccount.inc:369
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/groups/mail/class_mailGroup.inc:187
+#: personal/mail/class_mailAccount.inc:373
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:32
+msgid "IMAP/POP3 generic service"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "IMAP/POP3"
+msgstr ""
+
+#: admin/systems/services/imap/class_serviceIMAP.inc:33
+msgid "Services"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:29
+msgid "Mail plugin configuration"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:41
+#: personal/mail/class_mailAccount.inc:74
+msgid "Mail settings"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:44
+msgid "Account identification attribute"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:45
+msgid "Which attribute will be used to create accounts."
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:50
+msgid "Mail user template"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:51
+msgid "Override the user account creation syntax."
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:55
+msgid "Mail folder template"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:56
+msgid "Override the methods default account creation syntax."
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:60
+msgid "Use cyrus UNIX style"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:61
+msgid ""
+"Determines if 'foo/bar' or 'foo.bar' should be uses as namespaces in IMAP."
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:65
+msgid "Delete mailbox on account deletion"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:66
+msgid ""
+"Determines if the mailbox should be removed from your IMAP server after the "
+"account is deleted in LDAP."
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:71
+msgid "Cyrus autocreate folders"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:72
+msgid ""
+"List of personal IMAP folders that should be created along initial account "
+"creation."
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:77
+msgid "IMAP timeout"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:78
+msgid "Sets the connection timeout for imap actions."
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:83
+msgid "Shared prefix"
+msgstr ""
+
+#: config/mail/class_mailPluginConfig.inc:84
+msgid "Prefix to add for mail shared folders."
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:45
+#, php-format
+msgid "Cannot read quota settings: %s"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:55
+msgid "Quota usage"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:56
+msgid "Part of the quota which is used"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:96
+msgid "Mail account"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:99
+msgid "Primary mail address"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:103
+msgid "Specify the mail server where the user will be hosted on"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:108
+msgid "Quota size"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:115
+msgid "Other addresses and redirections"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:119
+msgid "List of alternative mail addresses"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:124
+msgid "Forward messages to"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:124
+msgid "Addresses to which messages should be forwarded"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
+msgid "Vacation message"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:133
+msgid "Activate vacation message"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:134
+msgid ""
+"Select to automatically response with the vacation message defined below"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:139
+msgid "from"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:144
+msgid "till"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:155
+msgid "Advanced mail options"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:163
+msgid "User is only allowed to send and receive local mails"
+msgstr ""
+
+#: 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:169
+msgid "No delivery to own mailbox"
+msgstr ""
+
+#: 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:261
+#, php-format
+msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:329
+#, php-format
+msgid "Cannot write quota settings: %s"
+msgstr ""
+
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:144
+msgid "Configuration error"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:145
+#, php-format
+msgid "The configured mail attribute '%s' is unsupported!"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:703
+msgid "Unknown"
+msgstr ""
+
+#: personal/mail/class_mail-methods.inc:705
+msgid "Unlimited"
+msgstr ""
diff --git a/mixedgroups/locale/af_ZA/fusiondirectory.po b/mixedgroups/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..b5260e72c30843c6dec1f28e97bc46f7763a9c42
--- /dev/null
+++ b/mixedgroups/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,75 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+msgid "Posix group"
+msgstr ""
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
+msgid "Posix group settings"
+msgstr ""
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
+msgid "Properties"
+msgstr ""
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
+msgid "Force GID"
+msgstr ""
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
+msgid "Force GID value for this group"
+msgstr ""
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
+msgid "GID"
+msgstr ""
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+msgid "GID value for this group"
+msgstr ""
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
+msgid "System trust"
+msgstr ""
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
+msgid "Trust mode"
+msgstr ""
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
+msgid "Type of authorization for those hosts"
+msgstr ""
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
+msgid "disabled"
+msgstr ""
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
+msgid "full access"
+msgstr ""
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
+msgid "allow access to these hosts"
+msgstr ""
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
+msgid "Only allow this group to connect to this list of hosts"
+msgstr ""
diff --git a/mixedgroups/locale/ar/fusiondirectory.po b/mixedgroups/locale/ar/fusiondirectory.po
index ceccb7a0b45b1171958d9219f4fab2217be8e728..4ffc0de37b62e054aedd3f6ee7fddd26e616f047 100644
--- a/mixedgroups/locale/ar/fusiondirectory.po
+++ b/mixedgroups/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/mixedgroups/locale/ca/fusiondirectory.po b/mixedgroups/locale/ca/fusiondirectory.po
index 80698235bf157735e2dff4b31449c3452195efba..c6da30221f3e5c633ce018f659a5423c97478fff 100644
--- a/mixedgroups/locale/ca/fusiondirectory.po
+++ b/mixedgroups/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/mixedgroups/locale/cs_CZ/fusiondirectory.po b/mixedgroups/locale/cs_CZ/fusiondirectory.po
index 3e2ebf740acd0712148b619af6ef3154e720ff66..e290485e2efe7141cf2945fcf9da7cbfa40008b0 100644
--- a/mixedgroups/locale/cs_CZ/fusiondirectory.po
+++ b/mixedgroups/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
diff --git a/mixedgroups/locale/de/fusiondirectory.po b/mixedgroups/locale/de/fusiondirectory.po
index 2e7162a1acde1bb8f2eb8e2b47d3e4d0ee0e3856..42a83423e13751223307e2c76817167a8646a1f9 100644
--- a/mixedgroups/locale/de/fusiondirectory.po
+++ b/mixedgroups/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/mixedgroups/locale/el_GR/fusiondirectory.po b/mixedgroups/locale/el_GR/fusiondirectory.po
index 9e5ca9f0295b376a88b423385f2e1b8657c575cb..5266422997ed0ae74fd569637c732f1ed5871fd2 100644
--- a/mixedgroups/locale/el_GR/fusiondirectory.po
+++ b/mixedgroups/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/mixedgroups/locale/es/fusiondirectory.po b/mixedgroups/locale/es/fusiondirectory.po
index 23fe7a1cc15d5e2b71e46136972c385cde245b42..9baa84a1c216af7e8c6377b12ca78857ee9548ea 100644
--- a/mixedgroups/locale/es/fusiondirectory.po
+++ b/mixedgroups/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/mixedgroups/locale/es_CO/fusiondirectory.po b/mixedgroups/locale/es_CO/fusiondirectory.po
index 0da55258cff2c00c8578a99c9ce3b1587bea6241..2dacf786ffc46044ccd06012fa5cf3dbf74c6b44 100644
--- a/mixedgroups/locale/es_CO/fusiondirectory.po
+++ b/mixedgroups/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/mixedgroups/locale/es_VE/fusiondirectory.po b/mixedgroups/locale/es_VE/fusiondirectory.po
index e4037db73ab6f8aea9fb1c88f5750e71b5a5f3ed..814b0619e3d42aeb3a5d8c698f250aaeb2db717a 100644
--- a/mixedgroups/locale/es_VE/fusiondirectory.po
+++ b/mixedgroups/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/mixedgroups/locale/fa_IR/fusiondirectory.po b/mixedgroups/locale/fa_IR/fusiondirectory.po
index fec739cffbfb2ea0d6f687dd5c88f7299fc5fbba..b99d370821f4da8a69c119d6d694703fb1c232a6 100644
--- a/mixedgroups/locale/fa_IR/fusiondirectory.po
+++ b/mixedgroups/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
diff --git a/mixedgroups/locale/fi_FI/fusiondirectory.po b/mixedgroups/locale/fi_FI/fusiondirectory.po
index 8c048a71f40324c7792cb2cdfdb16f32e6422227..677a41e3f523d1085a9f2e8ad9f9aedb22ea7c13 100644
--- a/mixedgroups/locale/fi_FI/fusiondirectory.po
+++ b/mixedgroups/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/mixedgroups/locale/fr/fusiondirectory.po b/mixedgroups/locale/fr/fusiondirectory.po
index 96c01a24cfb04a813edfc9ab4040a31b6ae4c2a2..ac4fd9f78de279fbfa6f569a078da127deed8423 100644
--- a/mixedgroups/locale/fr/fusiondirectory.po
+++ b/mixedgroups/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/mixedgroups/locale/hu_HU/fusiondirectory.po b/mixedgroups/locale/hu_HU/fusiondirectory.po
index edf83ce9ea1e04cde6b94565929acfc29241a3ef..ed8fb8220ce65cd91741465dd2def9d65a10f212 100644
--- a/mixedgroups/locale/hu_HU/fusiondirectory.po
+++ b/mixedgroups/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/mixedgroups/locale/id/fusiondirectory.po b/mixedgroups/locale/id/fusiondirectory.po
index ac519305ec127ebffecd283a20a20aa45d1dc2d3..edcf056409cd7f0eb17fcddca0e375f6472e089a 100644
--- a/mixedgroups/locale/id/fusiondirectory.po
+++ b/mixedgroups/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/mixedgroups/locale/it_IT/fusiondirectory.po b/mixedgroups/locale/it_IT/fusiondirectory.po
index 4c8f18fc7cdda5887548cd7db3b9a85ab9f01f4a..1b4c12ff408e4476141c1763a872ed2662aac352 100644
--- a/mixedgroups/locale/it_IT/fusiondirectory.po
+++ b/mixedgroups/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/mixedgroups/locale/ja/fusiondirectory.po b/mixedgroups/locale/ja/fusiondirectory.po
index 41df087d8591d6d27eab321dbbf645ec9c244684..22dc0bd14138f5ccd4ae19194c188753d0212227 100644
--- a/mixedgroups/locale/ja/fusiondirectory.po
+++ b/mixedgroups/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/mixedgroups/locale/ko/fusiondirectory.po b/mixedgroups/locale/ko/fusiondirectory.po
index 0ff55cda6fdd9ccd2988701526b5a04eb85b141c..25c8ca0c18a12ee7f60ff85ee74c5791d1ff0042 100644
--- a/mixedgroups/locale/ko/fusiondirectory.po
+++ b/mixedgroups/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/mixedgroups/locale/lv/fusiondirectory.po b/mixedgroups/locale/lv/fusiondirectory.po
index f5c18b6727c9802bb9bdcd59246b7d400851b47e..db466982723b96c893694a7b2facad649994335f 100644
--- a/mixedgroups/locale/lv/fusiondirectory.po
+++ b/mixedgroups/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/mixedgroups/locale/nb/fusiondirectory.po b/mixedgroups/locale/nb/fusiondirectory.po
index 569b07f0cbc1ebc635440871318d576cd2556e2c..c13019fd50288c80454833692c175e6a19edac00 100644
--- a/mixedgroups/locale/nb/fusiondirectory.po
+++ b/mixedgroups/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/mixedgroups/locale/nl/fusiondirectory.po b/mixedgroups/locale/nl/fusiondirectory.po
index 42299e39df3228d01f86380e57ebff9201f4d8b2..618fc2046fb689ed04ca791c255f52521f477860 100644
--- a/mixedgroups/locale/nl/fusiondirectory.po
+++ b/mixedgroups/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/mixedgroups/locale/pl/fusiondirectory.po b/mixedgroups/locale/pl/fusiondirectory.po
index a15f69a134bdac236c71576d160b1f757fc3c0d6..0bef6d3aa338807ee3916f36fdbebd4159c484a7 100644
--- a/mixedgroups/locale/pl/fusiondirectory.po
+++ b/mixedgroups/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/mixedgroups/locale/pt/fusiondirectory.po b/mixedgroups/locale/pt/fusiondirectory.po
index 9b169052d296b28d62f43e152652e89dd363537e..91442e6c299ad3aacfc47389fc9028b71bcc2b4b 100644
--- a/mixedgroups/locale/pt/fusiondirectory.po
+++ b/mixedgroups/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/mixedgroups/locale/pt_BR/fusiondirectory.po b/mixedgroups/locale/pt_BR/fusiondirectory.po
index f0a77bffe67cbcc564112862fcbc34d6b4a895f3..f0ea81a00c3ec9ea68d88347f8e8c2655d73bc29 100644
--- a/mixedgroups/locale/pt_BR/fusiondirectory.po
+++ b/mixedgroups/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/mixedgroups/locale/ru/fusiondirectory.po b/mixedgroups/locale/ru/fusiondirectory.po
index 81439e4402d580277ec9ae3b71e53e6a47f0ffcd..ae4dec22fb88b4630427d44acbd24821c2219861 100644
--- a/mixedgroups/locale/ru/fusiondirectory.po
+++ b/mixedgroups/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/mixedgroups/locale/ru@petr1708/fusiondirectory.po b/mixedgroups/locale/ru@petr1708/fusiondirectory.po
index d3c64b8366b58d2558fd9dfe5b2ea4fae2361194..ca7a6154f6108ea3021cbf4e58290e81d8d7439e 100644
--- a/mixedgroups/locale/ru@petr1708/fusiondirectory.po
+++ b/mixedgroups/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/mixedgroups/locale/sv/fusiondirectory.po b/mixedgroups/locale/sv/fusiondirectory.po
index 2fc0a90b045c2471c064bdfc6c78fc41a1647957..69d6143a7072a5199adc5c4266fcdeb50bff15ad 100644
--- a/mixedgroups/locale/sv/fusiondirectory.po
+++ b/mixedgroups/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/mixedgroups/locale/tr_TR/fusiondirectory.po b/mixedgroups/locale/tr_TR/fusiondirectory.po
index 16d9b06a28ef55c503ba30137a66b62e648f9bdd..4d6957d815137b0350700e21fb48fbdba7b3a43d 100644
--- a/mixedgroups/locale/tr_TR/fusiondirectory.po
+++ b/mixedgroups/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/mixedgroups/locale/ug/fusiondirectory.po b/mixedgroups/locale/ug/fusiondirectory.po
index 494530724f89fcdf1e5961710b4dd723e8e75239..8c89afad2995971987ab98913d4943571db98ea9 100644
--- a/mixedgroups/locale/ug/fusiondirectory.po
+++ b/mixedgroups/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/mixedgroups/locale/vi_VN/fusiondirectory.po b/mixedgroups/locale/vi_VN/fusiondirectory.po
index cedb9303ec07d99f3c0c397146758be200f5cab6..c09bc4783cc4a5b59a8f13c0d3e71e90cb9b8d69 100644
--- a/mixedgroups/locale/vi_VN/fusiondirectory.po
+++ b/mixedgroups/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/mixedgroups/locale/zh/fusiondirectory.po b/mixedgroups/locale/zh/fusiondirectory.po
index 53da1a4ddcfc36b2e0f550c5cb4df7a3d3762c9e..4a60eaf2ea5d66eb0067da5c6cc715e24ab93a2b 100644
--- a/mixedgroups/locale/zh/fusiondirectory.po
+++ b/mixedgroups/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/mixedgroups/locale/zh_TW/fusiondirectory.po b/mixedgroups/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..143ddc051a7814f3a08b65daf8ac9ace5a17cc03
--- /dev/null
+++ b/mixedgroups/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,75 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+msgid "Posix group"
+msgstr ""
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
+msgid "Posix group settings"
+msgstr ""
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
+msgid "Properties"
+msgstr ""
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
+msgid "Force GID"
+msgstr ""
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
+msgid "Force GID value for this group"
+msgstr ""
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
+msgid "GID"
+msgstr ""
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+msgid "GID value for this group"
+msgstr ""
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
+msgid "System trust"
+msgstr ""
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
+msgid "Trust mode"
+msgstr ""
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
+msgid "Type of authorization for those hosts"
+msgstr ""
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
+msgid "disabled"
+msgstr ""
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
+msgid "full access"
+msgstr ""
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
+msgid "allow access to these hosts"
+msgstr ""
+
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
+msgid "Only allow this group to connect to this list of hosts"
+msgstr ""
diff --git a/nagios/locale/af_ZA/fusiondirectory.po b/nagios/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..3b9de83246097917d59052d6c0b25b01520af25a
--- /dev/null
+++ b/nagios/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,95 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: config/nagios/class_nagiosConfig.inc:28
+msgid "Nagios configuration"
+msgstr ""
+
+#: config/nagios/class_nagiosConfig.inc:29
+msgid "FusionDirectory nagios plugin configuration"
+msgstr ""
+
+#: config/nagios/class_nagiosConfig.inc:42
+#: personal/nagios/class_nagiosAccount.inc:40
+msgid "Nagios"
+msgstr ""
+
+#: config/nagios/class_nagiosConfig.inc:45
+msgid "Lconf prefix"
+msgstr ""
+
+#: config/nagios/class_nagiosConfig.inc:45
+msgid "Prefix used for lconf LDAP fields"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:41
+msgid "Nagios account settings"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:60
+msgid "Nagios Account"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:63
+msgid "Alias"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:63
+msgid "Name of the nagios alias"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:67
+msgid "Mail address"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:67
+msgid "Email of the nagios alias"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:71
+msgid "Host notification period"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:76
+msgid "Service notification period"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:81
+msgid "Service notification options"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:86
+msgid "Host notification options"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:91
+msgid "Pager"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:91
+msgid " Pager"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:95
+msgid "Service notification commands"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:99
+msgid "Host notification commands"
+msgstr ""
diff --git a/nagios/locale/ar/fusiondirectory.po b/nagios/locale/ar/fusiondirectory.po
index 8264c4457d2632082614db8246383051c58082cb..b0c0fb415a1d3516b575033aa2bef50a8d6618c0 100644
--- a/nagios/locale/ar/fusiondirectory.po
+++ b/nagios/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/nagios/locale/ca/fusiondirectory.po b/nagios/locale/ca/fusiondirectory.po
index c304e4c06dc00c2250069453db22e492fd51bec8..38e43258bdac530e7ad441333c113a14ac71056e 100644
--- a/nagios/locale/ca/fusiondirectory.po
+++ b/nagios/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/nagios/locale/cs_CZ/fusiondirectory.po b/nagios/locale/cs_CZ/fusiondirectory.po
index 93b72da4f66193dcc5e701cf2c17094f915c1de4..6006bbf27a56a63d708ba9e0e2057b699bc0d434 100644
--- a/nagios/locale/cs_CZ/fusiondirectory.po
+++ b/nagios/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: config/nagios/class_nagiosConfig.inc:28
 msgid "Nagios configuration"
diff --git a/nagios/locale/de/fusiondirectory.po b/nagios/locale/de/fusiondirectory.po
index 05a9ee811bb59cccc650eaffdf54ea5903a9a872..466ef139fbcce7f96a18595a258a553a383ed80e 100644
--- a/nagios/locale/de/fusiondirectory.po
+++ b/nagios/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/nagios/locale/el_GR/fusiondirectory.po b/nagios/locale/el_GR/fusiondirectory.po
index bcb20275ef5aeb3481a4ab6c27ca0b28c4387a9f..b3139f9dc6cd86c5fcca72382addff2e817fa6e7 100644
--- a/nagios/locale/el_GR/fusiondirectory.po
+++ b/nagios/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/nagios/locale/es/fusiondirectory.po b/nagios/locale/es/fusiondirectory.po
index c596dd0e0cacd5e6997cb60445f44f1582edd770..b304c3ab7ac14a705cfc054a86aa2590dbc6cdc4 100644
--- a/nagios/locale/es/fusiondirectory.po
+++ b/nagios/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/nagios/locale/es_CO/fusiondirectory.po b/nagios/locale/es_CO/fusiondirectory.po
index 5576a80db8f55e74c464216f6aa25990607a4b1b..34c56ddb8ae218e256a157bb72447e1f0313483a 100644
--- a/nagios/locale/es_CO/fusiondirectory.po
+++ b/nagios/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/nagios/locale/es_VE/fusiondirectory.po b/nagios/locale/es_VE/fusiondirectory.po
index de0eb083c197732bbd88adf852baca64ca1cd52d..aba6f1ff1a6faea799d0338b1401e4b1191fec28 100644
--- a/nagios/locale/es_VE/fusiondirectory.po
+++ b/nagios/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/nagios/locale/fa_IR/fusiondirectory.po b/nagios/locale/fa_IR/fusiondirectory.po
index 1cd4c8b579918976ee4a7cb9ab8dee3e81bb9319..f1bbf26ea38168e012cc303cc8b9621eda30a9e7 100644
--- a/nagios/locale/fa_IR/fusiondirectory.po
+++ b/nagios/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa_IR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: config/nagios/class_nagiosConfig.inc:28
 msgid "Nagios configuration"
diff --git a/nagios/locale/fi_FI/fusiondirectory.po b/nagios/locale/fi_FI/fusiondirectory.po
index 515a3ed50324b16de545a8cfa115a97b560483d5..d9d21f631f0c33b0fd9035a5348127fc11739f77 100644
--- a/nagios/locale/fi_FI/fusiondirectory.po
+++ b/nagios/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/nagios/locale/fr/fusiondirectory.po b/nagios/locale/fr/fusiondirectory.po
index 0a1865fde7def6f293c79298f2c7de4573dfdaaa..e9b6984e342ccc4926d71ce80c78ff40a49c38ff 100644
--- a/nagios/locale/fr/fusiondirectory.po
+++ b/nagios/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/nagios/locale/hu_HU/fusiondirectory.po b/nagios/locale/hu_HU/fusiondirectory.po
index 34c71ca5cfadca276afb83e8bb240579da4c3457..6cf799c2c7e16a51ed9af188aaa975fcaa3abb40 100644
--- a/nagios/locale/hu_HU/fusiondirectory.po
+++ b/nagios/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/nagios/locale/id/fusiondirectory.po b/nagios/locale/id/fusiondirectory.po
index a7ac311cb5a84167f724338b4675f5fd845c04bd..88ff1938eaec9533b89dce7f90f7975c34fa789f 100644
--- a/nagios/locale/id/fusiondirectory.po
+++ b/nagios/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/nagios/locale/it_IT/fusiondirectory.po b/nagios/locale/it_IT/fusiondirectory.po
index 92898c030d8e5f220f036d779f93287a27df1382..551faf420b6df45437638660c410b422a3076c63 100644
--- a/nagios/locale/it_IT/fusiondirectory.po
+++ b/nagios/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/nagios/locale/ja/fusiondirectory.po b/nagios/locale/ja/fusiondirectory.po
index 91bd69c31c3edf59e81bd1308f1d774c798483b4..2373afece86bc32495e5662c11501c1ce0dcbd1f 100644
--- a/nagios/locale/ja/fusiondirectory.po
+++ b/nagios/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/nagios/locale/ko/fusiondirectory.po b/nagios/locale/ko/fusiondirectory.po
index 7456fc94f2484629d343d73d745dbf5d4f816df3..8b7dcc02c32479672411ddc01d24537f5f00d10a 100644
--- a/nagios/locale/ko/fusiondirectory.po
+++ b/nagios/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/nagios/locale/lv/fusiondirectory.po b/nagios/locale/lv/fusiondirectory.po
index 5a544cb656c6869092fbc21557473cfc78e4af01..82ff943135273a1789c3cbb2019fd001ab43cec1 100644
--- a/nagios/locale/lv/fusiondirectory.po
+++ b/nagios/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/nagios/locale/nb/fusiondirectory.po b/nagios/locale/nb/fusiondirectory.po
index 9e4609b795c25a0bcda8dc0f395511254e0ce209..73775c26a37d94b73166a8fd4f5fb8931cf2b2e8 100644
--- a/nagios/locale/nb/fusiondirectory.po
+++ b/nagios/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/nagios/locale/nl/fusiondirectory.po b/nagios/locale/nl/fusiondirectory.po
index 102759a46902dd64e808832ee83adca715da9381..effa52226880d0637eb91a2726ea70bcf70aa55d 100644
--- a/nagios/locale/nl/fusiondirectory.po
+++ b/nagios/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/nagios/locale/pl/fusiondirectory.po b/nagios/locale/pl/fusiondirectory.po
index b7bbc2af3d12459fd629955143cb28d55ac5cbb1..576af8643a31a92d06702be3a9d3359d48ef68da 100644
--- a/nagios/locale/pl/fusiondirectory.po
+++ b/nagios/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/nagios/locale/pt/fusiondirectory.po b/nagios/locale/pt/fusiondirectory.po
index 1126bf8987b76357f2f5b68792aaf94b68db829a..0e3b7496189a7b09c29d2dcf753bf81a0555196c 100644
--- a/nagios/locale/pt/fusiondirectory.po
+++ b/nagios/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/nagios/locale/pt_BR/fusiondirectory.po b/nagios/locale/pt_BR/fusiondirectory.po
index caa07ad3adf7d1886bd8dfbf16f0c31ca82e1556..97dde6c42dc0a58568878a320f9e64af8f414ffe 100644
--- a/nagios/locale/pt_BR/fusiondirectory.po
+++ b/nagios/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/nagios/locale/ru/fusiondirectory.po b/nagios/locale/ru/fusiondirectory.po
index 96cf137c4d553d5d9afeae5a8d0ccf37be88f716..bae1932decf716ab9c2b93653e568fb8942c234e 100644
--- a/nagios/locale/ru/fusiondirectory.po
+++ b/nagios/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/nagios/locale/ru@petr1708/fusiondirectory.po b/nagios/locale/ru@petr1708/fusiondirectory.po
index 243350b3a2ff29ee0e89ff1de6cc849439d02db9..5bd60fc16ddb35bfc59c0b95dc8261090a469596 100644
--- a/nagios/locale/ru@petr1708/fusiondirectory.po
+++ b/nagios/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/nagios/locale/sv/fusiondirectory.po b/nagios/locale/sv/fusiondirectory.po
index d0bb1fed6135572a062140bfbedd931ffe5085db..17488d6bc4ba48952d166675646ee059bb4956ee 100644
--- a/nagios/locale/sv/fusiondirectory.po
+++ b/nagios/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/nagios/locale/tr_TR/fusiondirectory.po b/nagios/locale/tr_TR/fusiondirectory.po
index 8a4c9ed64ad27535a8ec8b8e8edd1ffbfb046961..ad6bc4a7cf80a3f09b8fb9b1417467bc493d8398 100644
--- a/nagios/locale/tr_TR/fusiondirectory.po
+++ b/nagios/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/nagios/locale/ug/fusiondirectory.po b/nagios/locale/ug/fusiondirectory.po
index 9b460cf14d096d8ee031d19449185fc6379427b9..ea3368a94e3f009f85dd03e3494b4f0b6471076c 100644
--- a/nagios/locale/ug/fusiondirectory.po
+++ b/nagios/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/nagios/locale/vi_VN/fusiondirectory.po b/nagios/locale/vi_VN/fusiondirectory.po
index 6ef069c43639b9b6bbb3a96a6113398c9a729f0c..aa7cc6010032415431eb07a4c8a8ac5552cf37cf 100644
--- a/nagios/locale/vi_VN/fusiondirectory.po
+++ b/nagios/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/nagios/locale/zh/fusiondirectory.po b/nagios/locale/zh/fusiondirectory.po
index 8764f1a54ea9f45fadbb381acf4416dee7800b18..a78ec9460569945715512cc743bcb6b331d2d9f4 100644
--- a/nagios/locale/zh/fusiondirectory.po
+++ b/nagios/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/nagios/locale/zh_TW/fusiondirectory.po b/nagios/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..2005e2eae016c60cf55bbc7aa8c3365f7b717f01
--- /dev/null
+++ b/nagios/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,95 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: config/nagios/class_nagiosConfig.inc:28
+msgid "Nagios configuration"
+msgstr ""
+
+#: config/nagios/class_nagiosConfig.inc:29
+msgid "FusionDirectory nagios plugin configuration"
+msgstr ""
+
+#: config/nagios/class_nagiosConfig.inc:42
+#: personal/nagios/class_nagiosAccount.inc:40
+msgid "Nagios"
+msgstr ""
+
+#: config/nagios/class_nagiosConfig.inc:45
+msgid "Lconf prefix"
+msgstr ""
+
+#: config/nagios/class_nagiosConfig.inc:45
+msgid "Prefix used for lconf LDAP fields"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:41
+msgid "Nagios account settings"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:60
+msgid "Nagios Account"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:63
+msgid "Alias"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:63
+msgid "Name of the nagios alias"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:67
+msgid "Mail address"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:67
+msgid "Email of the nagios alias"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:71
+msgid "Host notification period"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:76
+msgid "Service notification period"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:81
+msgid "Service notification options"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:86
+msgid "Host notification options"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:91
+msgid "Pager"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:91
+msgid " Pager"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:95
+msgid "Service notification commands"
+msgstr ""
+
+#: personal/nagios/class_nagiosAccount.inc:99
+msgid "Host notification commands"
+msgstr ""
diff --git a/netgroups/locale/af_ZA/fusiondirectory.po b/netgroups/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..4d9b6e63cf5903e0720f7c99390108916339499f
--- /dev/null
+++ b/netgroups/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,107 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/netgroups/class_netgroupManagement.inc:34
+msgid "NIS Netgroups"
+msgstr ""
+
+#: admin/netgroups/class_netgroupManagement.inc:35
+msgid "NIS Netgroup management"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:50
+#: config/netgroups/class_netgroupConfig.inc:42
+msgid "Netgroup"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:51
+msgid "NIS Netgroup settings"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+#: personal/netgroups/class_netgroupMembership.inc:43
+msgid "NIS Netgroup"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:69
+msgid "Information"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:72
+msgid "Name"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:72
+msgid "Name of this NIS netgroup"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:75
+msgid "Description"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:75
+msgid "Description of this NIS netgroup"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:81
+msgid "User members"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:88 admin/netgroups/class_netgroup.inc:97
+#: admin/netgroups/class_netgroup.inc:104
+msgid "NIS netgroup members"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:94
+msgid "System members"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:101
+msgid "Netgroup members"
+msgstr ""
+
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+#: personal/netgroups/class_netgroupMembership.inc:44
+msgid "NIS Netgroup member"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Netgroup RDN"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Branch in which netgroups will be stored"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr ""
diff --git a/netgroups/locale/ar/fusiondirectory.po b/netgroups/locale/ar/fusiondirectory.po
index 1cce635f1d2e7134249d373125964e4e40403497..7f2e58140f6a09df57801c5d756fd2e47d050a95 100644
--- a/netgroups/locale/ar/fusiondirectory.po
+++ b/netgroups/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/netgroups/locale/ca/fusiondirectory.po b/netgroups/locale/ca/fusiondirectory.po
index 81b0388f4039a544d1fcb6d4747e51c3aad3469b..5a7b4f08560d620d0a38f388b4c9d29f46a277b4 100644
--- a/netgroups/locale/ca/fusiondirectory.po
+++ b/netgroups/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/netgroups/locale/cs_CZ/fusiondirectory.po b/netgroups/locale/cs_CZ/fusiondirectory.po
index e47ecd21aa3d3d5a478b3b36b094906a9d607ea8..41fbd56b385e8f39b3b90a4a0451a34ac43ff3b2 100644
--- a/netgroups/locale/cs_CZ/fusiondirectory.po
+++ b/netgroups/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/netgroups/class_netgroupManagement.inc:34
 msgid "NIS Netgroups"
diff --git a/netgroups/locale/de/fusiondirectory.po b/netgroups/locale/de/fusiondirectory.po
index c9b0ed90ad78072849af97bcdbe58a8e80f7b1f1..3d2e5b1b8195c9ac9861a0128b027c33ee75bff5 100644
--- a/netgroups/locale/de/fusiondirectory.po
+++ b/netgroups/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/netgroups/locale/el_GR/fusiondirectory.po b/netgroups/locale/el_GR/fusiondirectory.po
index d0e2bcc7f5075c75ae599ebc96caa5fcb2f347ba..2c76968f52fabeb606dde4f983b4e7ecea7acb43 100644
--- a/netgroups/locale/el_GR/fusiondirectory.po
+++ b/netgroups/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/netgroups/locale/es/fusiondirectory.po b/netgroups/locale/es/fusiondirectory.po
index 56a5ab059d614d47973e39bb9bff4f64e214ea1b..e53b5e4f8ee322a5986f3b9926944588bd48d139 100644
--- a/netgroups/locale/es/fusiondirectory.po
+++ b/netgroups/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/netgroups/locale/es_CO/fusiondirectory.po b/netgroups/locale/es_CO/fusiondirectory.po
index 5cd059e0696be5be0073c41673b2435bbb02b2cf..04f0718e844fa51196b0114dff694fbc10675669 100644
--- a/netgroups/locale/es_CO/fusiondirectory.po
+++ b/netgroups/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/netgroups/locale/es_VE/fusiondirectory.po b/netgroups/locale/es_VE/fusiondirectory.po
index 3eb526b3894838cf4eea8bccc49d04e08b9941bf..dc165be686fc899714b3d00facad69aedbdde7c1 100644
--- a/netgroups/locale/es_VE/fusiondirectory.po
+++ b/netgroups/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/netgroups/locale/fa_IR/fusiondirectory.po b/netgroups/locale/fa_IR/fusiondirectory.po
index 59c48c979bb441e7b013d50053e6ee79aa5aa7d7..d55ff405dc98c9dab53ea4ba24625cefb468090a 100644
--- a/netgroups/locale/fa_IR/fusiondirectory.po
+++ b/netgroups/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/netgroups/class_netgroupManagement.inc:34
 msgid "NIS Netgroups"
diff --git a/netgroups/locale/fi_FI/fusiondirectory.po b/netgroups/locale/fi_FI/fusiondirectory.po
index 35ff9bb4e3d29a8679cd0cf9a1e18c74956543a9..0b861c1a6f2160f2cd57f0b05dc290bdb7adc447 100644
--- a/netgroups/locale/fi_FI/fusiondirectory.po
+++ b/netgroups/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/netgroups/locale/fr/fusiondirectory.po b/netgroups/locale/fr/fusiondirectory.po
index fff56354c18faa00fce2a91b92d7de31319e7844..324917e69a9e600308ff57caa981a41c061a023b 100644
--- a/netgroups/locale/fr/fusiondirectory.po
+++ b/netgroups/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/netgroups/locale/hu_HU/fusiondirectory.po b/netgroups/locale/hu_HU/fusiondirectory.po
index 650f57c461eb9bbf5c535cafce80e407ccbee8d6..5fe2a742fda569a65afc96a9f1087f6ff3ec8604 100644
--- a/netgroups/locale/hu_HU/fusiondirectory.po
+++ b/netgroups/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/netgroups/locale/id/fusiondirectory.po b/netgroups/locale/id/fusiondirectory.po
index 3619eada77ee4927e1eaa2e89338ce4a3ccaf97f..a68a159c62d2e370586ba09a1ec735d82982a5ac 100644
--- a/netgroups/locale/id/fusiondirectory.po
+++ b/netgroups/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/netgroups/locale/it_IT/fusiondirectory.po b/netgroups/locale/it_IT/fusiondirectory.po
index 0d4f383fc3684bbd86776d96606c0290c15b5b88..42a1a03dacb229e447133d52e6ba751607be39f5 100644
--- a/netgroups/locale/it_IT/fusiondirectory.po
+++ b/netgroups/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/netgroups/locale/ja/fusiondirectory.po b/netgroups/locale/ja/fusiondirectory.po
index 6c450c3a69a5073be9798b3dc68f5af4f604d2b5..29cb7335a81e4a6bd96d4d021ca15c59a80d7227 100644
--- a/netgroups/locale/ja/fusiondirectory.po
+++ b/netgroups/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/netgroups/locale/ko/fusiondirectory.po b/netgroups/locale/ko/fusiondirectory.po
index b68d672db3ffcc36fc1d62844fda634a2c13a850..b854300d0357bd61ad8f1a2ee5de46e561c69156 100644
--- a/netgroups/locale/ko/fusiondirectory.po
+++ b/netgroups/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/netgroups/locale/lv/fusiondirectory.po b/netgroups/locale/lv/fusiondirectory.po
index 6273b7c9cfb76960e7180dfa5443aa598d4d88fc..a154ca1c4337d32a5255e75886f6255951ce3196 100644
--- a/netgroups/locale/lv/fusiondirectory.po
+++ b/netgroups/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/netgroups/locale/nb/fusiondirectory.po b/netgroups/locale/nb/fusiondirectory.po
index 7a239947c52b0c0d1f45981f07d7b7d2d1d9a7ed..594b6f08709b7a0344126a1f2b6d93d15f0c358a 100644
--- a/netgroups/locale/nb/fusiondirectory.po
+++ b/netgroups/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/netgroups/locale/nl/fusiondirectory.po b/netgroups/locale/nl/fusiondirectory.po
index f034babac0a054e67042fd4c8333f64b44e28cc6..a32c04679a604125ca2ac494460da7a4453f66e1 100644
--- a/netgroups/locale/nl/fusiondirectory.po
+++ b/netgroups/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/netgroups/locale/pl/fusiondirectory.po b/netgroups/locale/pl/fusiondirectory.po
index 36700cbce97a0dafa32be353f1c797ca15ce3276..f40b25a05d18a72e876fa4ec251f19ff0d3d09ed 100644
--- a/netgroups/locale/pl/fusiondirectory.po
+++ b/netgroups/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/netgroups/locale/pt/fusiondirectory.po b/netgroups/locale/pt/fusiondirectory.po
index cd5ca7b572527097e4aff86ffe62f52b27fe4886..f1a858d4ed8b3c3f163bb10146035102b90ec909 100644
--- a/netgroups/locale/pt/fusiondirectory.po
+++ b/netgroups/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/netgroups/locale/pt_BR/fusiondirectory.po b/netgroups/locale/pt_BR/fusiondirectory.po
index 9b9f892de30724570ec304edc3f44389ee963e1d..0684d6e823d88d8636ecb2ce54de021ae182c693 100644
--- a/netgroups/locale/pt_BR/fusiondirectory.po
+++ b/netgroups/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/netgroups/locale/ru/fusiondirectory.po b/netgroups/locale/ru/fusiondirectory.po
index 54073beb603c4edf014787c8a3cfb2ef72f3d5e9..bf9058e9ae0206b36c18b5cf7d1d90f9e5027e78 100644
--- a/netgroups/locale/ru/fusiondirectory.po
+++ b/netgroups/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/netgroups/locale/ru@petr1708/fusiondirectory.po b/netgroups/locale/ru@petr1708/fusiondirectory.po
index ae9737c11034cc40425bbc904e99ec84a8323757..3f7b842a4aef6b9981b0c0cf598e77ad04d93b6d 100644
--- a/netgroups/locale/ru@petr1708/fusiondirectory.po
+++ b/netgroups/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/netgroups/locale/sv/fusiondirectory.po b/netgroups/locale/sv/fusiondirectory.po
index 9a0d49260b3427d369ba9517ce8495c0e5e1c364..a01df7bec3f3c98b3b376fef57a20f57d5af0d6d 100644
--- a/netgroups/locale/sv/fusiondirectory.po
+++ b/netgroups/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/netgroups/locale/tr_TR/fusiondirectory.po b/netgroups/locale/tr_TR/fusiondirectory.po
index 6334908842557f1949699055c6adcd9bdef3a99a..1860ee51c851973a2a89246c195f388ef2c09477 100644
--- a/netgroups/locale/tr_TR/fusiondirectory.po
+++ b/netgroups/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/netgroups/locale/ug/fusiondirectory.po b/netgroups/locale/ug/fusiondirectory.po
index 79a3749a471dbfb837f36d54776fd943e121d0dd..94f4069c04fdd8b9ef8a5ebf25a559aa0956014d 100644
--- a/netgroups/locale/ug/fusiondirectory.po
+++ b/netgroups/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/netgroups/locale/vi_VN/fusiondirectory.po b/netgroups/locale/vi_VN/fusiondirectory.po
index 3c40ea4ebcaba4f845e70093cbef7164eaa074ad..49499c97c8e0e0a5d5d0e34356dbe97bb4ddab5e 100644
--- a/netgroups/locale/vi_VN/fusiondirectory.po
+++ b/netgroups/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/netgroups/locale/zh/fusiondirectory.po b/netgroups/locale/zh/fusiondirectory.po
index dcfd0cb5dec2e709c3e390a22b0f9752b033c767..0f8edf4e8ffce5572f7ea541e06994c93f062120 100644
--- a/netgroups/locale/zh/fusiondirectory.po
+++ b/netgroups/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/netgroups/locale/zh_TW/fusiondirectory.po b/netgroups/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..912149dbf6bb0fe17693b1b0e64fed0d3ed53a88
--- /dev/null
+++ b/netgroups/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,107 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/netgroups/class_netgroupManagement.inc:34
+msgid "NIS Netgroups"
+msgstr ""
+
+#: admin/netgroups/class_netgroupManagement.inc:35
+msgid "NIS Netgroup management"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:50
+#: config/netgroups/class_netgroupConfig.inc:42
+msgid "Netgroup"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:51
+msgid "NIS Netgroup settings"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:54
+#: admin/systems/netgroups/class_netgroupSystem.inc:26
+#: personal/netgroups/class_netgroupMembership.inc:43
+msgid "NIS Netgroup"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:69
+msgid "Information"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:72
+msgid "Name"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:72
+msgid "Name of this NIS netgroup"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:75
+msgid "Description"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:75
+msgid "Description of this NIS netgroup"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:81
+msgid "User members"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:88 admin/netgroups/class_netgroup.inc:97
+#: admin/netgroups/class_netgroup.inc:104
+msgid "NIS netgroup members"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:94
+msgid "System members"
+msgstr ""
+
+#: admin/netgroups/class_netgroup.inc:101
+msgid "Netgroup members"
+msgstr ""
+
+#: admin/systems/netgroups/class_netgroupSystem.inc:27
+#: personal/netgroups/class_netgroupMembership.inc:44
+msgid "NIS Netgroup member"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:28
+msgid "Netgroup configuration"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:29
+msgid "FusionDirectory netgroup plugin configuration"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Netgroup RDN"
+msgstr ""
+
+#: config/netgroups/class_netgroupConfig.inc:45
+msgid "Branch in which netgroups will be stored"
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:60
+msgid "Member of the following NIS Netgroups  "
+msgstr ""
+
+#: personal/netgroups/class_netgroupMembership.inc:63
+msgid "NIS netgroup membership"
+msgstr ""
diff --git a/newsletter/locale/af_ZA/fusiondirectory.po b/newsletter/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..51198e17998e0a0a415e8ba2ef315d83dff7f222
--- /dev/null
+++ b/newsletter/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,55 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: config/newsletter/class_newsletterConfig.inc:28
+msgid "Newsletter configuration"
+msgstr ""
+
+#: config/newsletter/class_newsletterConfig.inc:29
+msgid "FusionDirectory newsletter plugin configuration"
+msgstr ""
+
+#: config/newsletter/class_newsletterConfig.inc:41
+#: personal/newsletter/class_newsletterSubscriptions.inc:30
+msgid "Newsletter"
+msgstr ""
+
+#: config/newsletter/class_newsletterConfig.inc:45
+msgid "Newsletter choices"
+msgstr ""
+
+#: config/newsletter/class_newsletterConfig.inc:45
+msgid "Newsletters the user can choose from"
+msgstr ""
+
+#: personal/newsletter/class_newsletterSubscriptions.inc:31
+msgid "Newsletter subscriptions"
+msgstr ""
+
+#: personal/newsletter/class_newsletterSubscriptions.inc:46
+msgid "Personal info"
+msgstr ""
+
+#: personal/newsletter/class_newsletterSubscriptions.inc:50
+msgid "Subscriptions"
+msgstr ""
+
+#: personal/newsletter/class_newsletterSubscriptions.inc:50
+msgid "Newsletter you are subscribed to"
+msgstr ""
diff --git a/newsletter/locale/ar/fusiondirectory.po b/newsletter/locale/ar/fusiondirectory.po
index f3ccba8bf53ad57e132cffce52d447d7c9eadac9..692de527de22baae0b9505dd735ae094308c780b 100644
--- a/newsletter/locale/ar/fusiondirectory.po
+++ b/newsletter/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/ca/fusiondirectory.po b/newsletter/locale/ca/fusiondirectory.po
index 572f9033187bcaad8e1a4cb66b1d1e2df3a0c5b3..2fb61a9eba7c86651e77f080f48c2e7fc8a6a054 100644
--- a/newsletter/locale/ca/fusiondirectory.po
+++ b/newsletter/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/cs_CZ/fusiondirectory.po b/newsletter/locale/cs_CZ/fusiondirectory.po
index 158a58f06252fe4e100b3c4727db2722a6cc9ef5..fe442a5a7ddf46e883e29e1d9a721358d55637ca 100644
--- a/newsletter/locale/cs_CZ/fusiondirectory.po
+++ b/newsletter/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: config/newsletter/class_newsletterConfig.inc:28
 msgid "Newsletter configuration"
diff --git a/newsletter/locale/de/fusiondirectory.po b/newsletter/locale/de/fusiondirectory.po
index 18bf032ca4a0b981dfbb57891ddca6f79ecfc5d7..266c28507baec25967f2cc73b47f367401061866 100644
--- a/newsletter/locale/de/fusiondirectory.po
+++ b/newsletter/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/newsletter/locale/el_GR/fusiondirectory.po b/newsletter/locale/el_GR/fusiondirectory.po
index ce8b98e31ee0c24b3fe827b267399f57f6550366..39d584040fc1f5a57b59e2c83f8f22585565d46b 100644
--- a/newsletter/locale/el_GR/fusiondirectory.po
+++ b/newsletter/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/newsletter/locale/es/fusiondirectory.po b/newsletter/locale/es/fusiondirectory.po
index 9f74c2ec14e83f35a8cfb2fabdb18021f83ed727..9ea028c521b5d4684b00d5c8956fac2829e0fc9b 100644
--- a/newsletter/locale/es/fusiondirectory.po
+++ b/newsletter/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/es_CO/fusiondirectory.po b/newsletter/locale/es_CO/fusiondirectory.po
index ee9631010561694e8cc2d1752ad3e94701fd6ef3..d14b22ce57edb167467235316d09fa49c6880370 100644
--- a/newsletter/locale/es_CO/fusiondirectory.po
+++ b/newsletter/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/es_VE/fusiondirectory.po b/newsletter/locale/es_VE/fusiondirectory.po
index cc7c426dfd9c9411e5c7c421f7800211aecaf6bc..69548169655a4a4ff13c0fa7391a7d773c0aa65a 100644
--- a/newsletter/locale/es_VE/fusiondirectory.po
+++ b/newsletter/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/fa_IR/fusiondirectory.po b/newsletter/locale/fa_IR/fusiondirectory.po
index 3e98e289b711b90f479df790a754ff2200543cf3..cb5d8d73e71db194f544c7b88c8cfbae8a35cca0 100644
--- a/newsletter/locale/fa_IR/fusiondirectory.po
+++ b/newsletter/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: config/newsletter/class_newsletterConfig.inc:28
 msgid "Newsletter configuration"
diff --git a/newsletter/locale/fi_FI/fusiondirectory.po b/newsletter/locale/fi_FI/fusiondirectory.po
index 5c979ea3e36e576da1d0bde788bfd0e6f3e6af49..45bd2a9bb054ea3b23d3561547ca7a9ce5caa95a 100644
--- a/newsletter/locale/fi_FI/fusiondirectory.po
+++ b/newsletter/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/fr/fusiondirectory.po b/newsletter/locale/fr/fusiondirectory.po
index 9530df1e78c2641b6a9448c19d07548d49c85edc..f06837c7d198f0b0a4f33cfc3d5aebdc3636e307 100644
--- a/newsletter/locale/fr/fusiondirectory.po
+++ b/newsletter/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/newsletter/locale/hu_HU/fusiondirectory.po b/newsletter/locale/hu_HU/fusiondirectory.po
index 6c68f95cdea65043e2bc47944049e60c6a0be59a..bfe81c7734b6b63e3a88669ecb4d6796ab88d613 100644
--- a/newsletter/locale/hu_HU/fusiondirectory.po
+++ b/newsletter/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/id/fusiondirectory.po b/newsletter/locale/id/fusiondirectory.po
index e7f6ff8543e44d35e0a3ce63e6c317be97276ccd..52ab1866a6f0f8f4e7922ed55dc86c5e25218ff9 100644
--- a/newsletter/locale/id/fusiondirectory.po
+++ b/newsletter/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/it_IT/fusiondirectory.po b/newsletter/locale/it_IT/fusiondirectory.po
index fe3fe9b371fc62a4cd54662eccf17a26c4a74493..ae8d42c14618c3b816df0a33aa77fc231bb3fab3 100644
--- a/newsletter/locale/it_IT/fusiondirectory.po
+++ b/newsletter/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/newsletter/locale/ja/fusiondirectory.po b/newsletter/locale/ja/fusiondirectory.po
index 873f9380cb1ad211d8c6b9af84e760bc937d86f9..4db6d218f40f272a3683ee6e678ca7a8afa19037 100644
--- a/newsletter/locale/ja/fusiondirectory.po
+++ b/newsletter/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/ko/fusiondirectory.po b/newsletter/locale/ko/fusiondirectory.po
index 0ba2c92379b5f85c60da3e7a28e7af2995672274..2cf24812ede0b9c39cea94c13e677fc9eae8c053 100644
--- a/newsletter/locale/ko/fusiondirectory.po
+++ b/newsletter/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/newsletter/locale/lv/fusiondirectory.po b/newsletter/locale/lv/fusiondirectory.po
index 6a3c99632892995c7554413de7f3579b4fbbbf90..56b5ca4c8426f489e3403b9e7d4357308f3d42c7 100644
--- a/newsletter/locale/lv/fusiondirectory.po
+++ b/newsletter/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/nb/fusiondirectory.po b/newsletter/locale/nb/fusiondirectory.po
index c6e52f721a9bf0b71bcc9fb175b70f6b716cbed6..8b7092ca9e16e878e400d5030280ebfd5df08ae3 100644
--- a/newsletter/locale/nb/fusiondirectory.po
+++ b/newsletter/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/nl/fusiondirectory.po b/newsletter/locale/nl/fusiondirectory.po
index b1ea06608ae6eb92be2e2422ead57e48a7ac6b82..9c76b7fff2764912c8a20002b8c3a5e2ffb9df1a 100644
--- a/newsletter/locale/nl/fusiondirectory.po
+++ b/newsletter/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/newsletter/locale/pl/fusiondirectory.po b/newsletter/locale/pl/fusiondirectory.po
index 11f4c47977c00e4893a999727aef6b373e575689..83f0a6b2632050cd75949d709772c831c390a96e 100644
--- a/newsletter/locale/pl/fusiondirectory.po
+++ b/newsletter/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/newsletter/locale/pt/fusiondirectory.po b/newsletter/locale/pt/fusiondirectory.po
index b5a019745bb1e012f4c0dbb1e5b1429b65642d46..657ad275b239dc736c83aa531b338b54f0e21eab 100644
--- a/newsletter/locale/pt/fusiondirectory.po
+++ b/newsletter/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/pt_BR/fusiondirectory.po b/newsletter/locale/pt_BR/fusiondirectory.po
index 93ce69960b521ae3c05d34ecdd6b0795894bd745..cd6468f341e5b478e1aefa9616ce685c5d84250e 100644
--- a/newsletter/locale/pt_BR/fusiondirectory.po
+++ b/newsletter/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/ru/fusiondirectory.po b/newsletter/locale/ru/fusiondirectory.po
index 80bdf344b479e3665b41c2a02f2d3a5a6820dd70..7a062a8eebb680a9791508551c1ecb098413ee4b 100644
--- a/newsletter/locale/ru/fusiondirectory.po
+++ b/newsletter/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/newsletter/locale/ru@petr1708/fusiondirectory.po b/newsletter/locale/ru@petr1708/fusiondirectory.po
index 3544964526e091d01d110fcef4f1900b1a8fb290..f698d5a08fa241e69b08ed7972a9e6a858d04bf2 100644
--- a/newsletter/locale/ru@petr1708/fusiondirectory.po
+++ b/newsletter/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/sv/fusiondirectory.po b/newsletter/locale/sv/fusiondirectory.po
index bfd66e86f39a42d322114d128c8f5efb9a7c8391..041af0f3f10da9e009de84ec9a8bec645b1721d8 100644
--- a/newsletter/locale/sv/fusiondirectory.po
+++ b/newsletter/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/tr_TR/fusiondirectory.po b/newsletter/locale/tr_TR/fusiondirectory.po
index c7115f5aac78d6ae71dd17ae9b3442bf13a5c939..578d828edfa771c831aecc9a7375a278b08c7862 100644
--- a/newsletter/locale/tr_TR/fusiondirectory.po
+++ b/newsletter/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/ug/fusiondirectory.po b/newsletter/locale/ug/fusiondirectory.po
index 048cdd605040027323397e83e2f6d881eca6d8b3..1bff438829a76ea907733a126cc28176e37ae0da 100644
--- a/newsletter/locale/ug/fusiondirectory.po
+++ b/newsletter/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/vi_VN/fusiondirectory.po b/newsletter/locale/vi_VN/fusiondirectory.po
index eadca604ea7a1bf462feeae53a9cd3bac02a658f..ea4133b345157f5e6f8dcec498cd2b4b1b3a28c3 100644
--- a/newsletter/locale/vi_VN/fusiondirectory.po
+++ b/newsletter/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/zh/fusiondirectory.po b/newsletter/locale/zh/fusiondirectory.po
index 94a36c7ead8b27206080a85047a00350cbbcd2e9..2ea26113a83f36cfaaa1b2b86eb2b6ffa887778b 100644
--- a/newsletter/locale/zh/fusiondirectory.po
+++ b/newsletter/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
diff --git a/newsletter/locale/zh_TW/fusiondirectory.po b/newsletter/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..c5cd79e0ec98f7d20b175167ab6b54f542244c8d
--- /dev/null
+++ b/newsletter/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,55 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: config/newsletter/class_newsletterConfig.inc:28
+msgid "Newsletter configuration"
+msgstr ""
+
+#: config/newsletter/class_newsletterConfig.inc:29
+msgid "FusionDirectory newsletter plugin configuration"
+msgstr ""
+
+#: config/newsletter/class_newsletterConfig.inc:41
+#: personal/newsletter/class_newsletterSubscriptions.inc:30
+msgid "Newsletter"
+msgstr ""
+
+#: config/newsletter/class_newsletterConfig.inc:45
+msgid "Newsletter choices"
+msgstr ""
+
+#: config/newsletter/class_newsletterConfig.inc:45
+msgid "Newsletters the user can choose from"
+msgstr ""
+
+#: personal/newsletter/class_newsletterSubscriptions.inc:31
+msgid "Newsletter subscriptions"
+msgstr ""
+
+#: personal/newsletter/class_newsletterSubscriptions.inc:46
+msgid "Personal info"
+msgstr ""
+
+#: personal/newsletter/class_newsletterSubscriptions.inc:50
+msgid "Subscriptions"
+msgstr ""
+
+#: personal/newsletter/class_newsletterSubscriptions.inc:50
+msgid "Newsletter you are subscribed to"
+msgstr ""
diff --git a/opsi/admin/opsi/class_opsiOnDemandList.inc b/opsi/admin/opsi/class_opsiOnDemandList.inc
index 4b70aa7d194967852c7d1d06f3b29961047393d8..77d6ccbe22f3375fd9595000cfd85bd362a6ff40 100644
--- a/opsi/admin/opsi/class_opsiOnDemandList.inc
+++ b/opsi/admin/opsi/class_opsiOnDemandList.inc
@@ -35,6 +35,9 @@ class opsiOnDemandList extends opsiSoftwareList
         'ou'      => get_ou('opsiRDN'),
         'icon'    => 'geticon.php?context=applications&icon=opsi-on-demand&size=16',
       )),
+      'plForeignKeys'   => array(
+        'fdOpsiServerDn' => 'serverGeneric',
+      ),
 
       'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
diff --git a/opsi/admin/opsi/class_opsiProfile.inc b/opsi/admin/opsi/class_opsiProfile.inc
index 3b6272777d22de123b2ffb7b3154d93b856ac171..e8b9c5acbfcc67464af25ae9d6844df42c74c76d 100644
--- a/opsi/admin/opsi/class_opsiProfile.inc
+++ b/opsi/admin/opsi/class_opsiProfile.inc
@@ -74,6 +74,10 @@ class opsiProfile extends simplePlugin
         'ou'      => get_ou('opsiRDN'),
         'icon'    => 'geticon.php?context=applications&icon=opsi&size=16',
       )),
+      'plForeignKeys'   => array(
+        'fdOpsiServerDn'      => 'serverGeneric',
+        'fdOpsiSoftwareList'  => 'opsiSoftwareList',
+      ),
 
       'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
@@ -171,7 +175,7 @@ class opsiProfile extends simplePlugin
         }
       } else {
         msg_dialog::display(
-          sprintf_(_("Could not find %s in the LDAP"), $this->fdOpsiServerDn),
+          sprintf(_('Could not find %s in the LDAP'), $this->fdOpsiServerDn),
           msgPool::ldaperror($ldap->get_error()), ERROR_DIALOG
         );
         return FALSE;
diff --git a/opsi/admin/opsi/class_opsiSoftwareList.inc b/opsi/admin/opsi/class_opsiSoftwareList.inc
index 53385f3111aca57dbb241351749c1583b5b6b1f8..7d678998a31f8c45939e6bb7814bb63f89977e66 100644
--- a/opsi/admin/opsi/class_opsiSoftwareList.inc
+++ b/opsi/admin/opsi/class_opsiSoftwareList.inc
@@ -39,6 +39,9 @@ class opsiSoftwareList extends simplePlugin
         'ou'      => get_ou('opsiRDN'),
         'icon'    => 'geticon.php?context=applications&icon=opsi-software-list&size=16',
       )),
+      'plForeignKeys'   => array(
+        'fdOpsiServerDn' => 'serverGeneric',
+      ),
 
       'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
diff --git a/opsi/admin/systems/opsi/class_opsiClient.inc b/opsi/admin/systems/opsi/class_opsiClient.inc
index 7ea92a859dae388a6c647c0e5ca2cd3e17a38927..4e686b0265daf1b616acbe439e92360dfeada20c 100644
--- a/opsi/admin/systems/opsi/class_opsiClient.inc
+++ b/opsi/admin/systems/opsi/class_opsiClient.inc
@@ -36,6 +36,10 @@ class opsiClient extends simplePlugin
       'plObjectType'  => array('workstation', 'ogroup-dynamic'),
       'plDepends'     => array('sambaSystemTab'),
       'plConflicts'   => array('debconfStartup','faiStartup'),
+      'plForeignKeys'   => array(
+        'fdOpsiServerDn'  => 'serverGeneric',
+        'fdOpsiProfileDn' => 'opsiProfile',
+      ),
 
       'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
diff --git a/opsi/locale/af_ZA/fusiondirectory.po b/opsi/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..d31c8e6172206bc0b4f7e4a7a56af025ec9c1360
--- /dev/null
+++ b/opsi/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,297 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/opsi/class_opsiSoftwareList.inc:32
+msgid "OPSI list"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:33
+#: admin/opsi/class_opsiSoftwareList.inc:37
+msgid "OPSI software list"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
+msgid "Infos"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
+msgid "OPSI server"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
+msgid "OPSI server to use for deployment"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
+#: admin/opsi/class_opsiProductProperties.inc:113
+msgid "Name"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
+msgid "Name of this OPSI profile"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
+msgid "Softwares"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:71
+msgid "The localboot products to install with this list"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
+msgid "Localboot products"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
+#: admin/opsi/class_opsiProductProperties.inc:174
+msgid "Could not contact argonaut server"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
+msgid "No mac address"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
+#, php-format
+msgid "Server %s has no mac address configured in the LDAP"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
+#, php-format
+msgid "Could not find %s in the LDAP"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
+#: admin/opsi/class_opsiProductProperties.inc:190
+msgid "Failed to contact OPSI server"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:152
+#, php-format
+msgid "%s (%s-%s)"
+msgstr ""
+
+#: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
+#: admin/opsi/class_opsiProfile.inc:72
+msgid "OPSI profile"
+msgstr ""
+
+#: admin/opsi/class_opsiProfile.inc:103
+msgid "Entries"
+msgstr ""
+
+#: admin/opsi/class_opsiProfile.inc:106
+msgid "Netboot product"
+msgstr ""
+
+#: admin/opsi/class_opsiProfile.inc:106
+msgid "The netboot product to use for this profile"
+msgstr ""
+
+#: admin/opsi/class_opsiProfile.inc:111
+msgid "Software lists"
+msgstr ""
+
+#: admin/opsi/class_opsiProfile.inc:111
+msgid "Software lists that will be installed with this profile"
+msgstr ""
+
+#: admin/opsi/class_opsiProfile.inc:206
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: admin/opsi/class_opsiOnDemandList.inc:28
+#: admin/opsi/class_opsiOnDemandList.inc:33
+msgid "OPSI ondemand list"
+msgstr ""
+
+#: admin/opsi/class_opsiOnDemandList.inc:29
+msgid "OPSI on demand software list"
+msgstr ""
+
+#: admin/opsi/class_opsiOnDemandList.inc:61
+msgid "Show details"
+msgstr ""
+
+#: admin/opsi/class_opsiOnDemandList.inc:61
+msgid "Show further information to the user"
+msgstr ""
+
+#: admin/opsi/class_opsiOnDemandList.inc:71
+msgid "The localboot products to put in this list"
+msgstr ""
+
+#: admin/opsi/class_opsiProfileManagement.inc:33
+#: config/opsi/class_opsiConfig.inc:42
+msgid "OPSI"
+msgstr ""
+
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
+msgid "Product properties"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:118
+msgid "Properties of the products of this profile"
+msgstr ""
+
+#: admin/systems/services/opsi/class_serviceOPSI.inc:29
+#: admin/systems/services/opsi/class_serviceOPSI.inc:30
+msgid "OPSI service"
+msgstr ""
+
+#: admin/systems/services/opsi/class_serviceOPSI.inc:30
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/opsi/class_serviceOPSI.inc:41
+msgid "OPSI Server information"
+msgstr ""
+
+#: admin/systems/services/opsi/class_serviceOPSI.inc:44
+msgid "Server URI"
+msgstr ""
+
+#: admin/systems/services/opsi/class_serviceOPSI.inc:44
+msgid "The URI to use for connection"
+msgstr ""
+
+#: admin/systems/services/opsi/class_serviceOPSI.inc:48
+msgid "User"
+msgstr ""
+
+#: admin/systems/services/opsi/class_serviceOPSI.inc:48
+msgid "The user to use for connection"
+msgstr ""
+
+#: admin/systems/services/opsi/class_serviceOPSI.inc:52
+msgid "Password"
+msgstr ""
+
+#: admin/systems/services/opsi/class_serviceOPSI.inc:52
+msgid "The password to use for connection"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:33
+msgid "OPSI client"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:34
+msgid "Edit OPSI client settings"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:52
+msgid "OPSI Client"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:55
+msgid "OPSI Server"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:55
+msgid "The OPSI Server this client is connected to"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:59
+msgid "OPSI Profile"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:59
+msgid "The OPSI Profile to apply to this client"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:100
+msgid "Could not get macAddress for OPSI server!"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:109
+#: admin/systems/opsi/class_opsiClient.inc:197
+msgid "Could not remove OPSI information"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:140
+msgid "This member was not found or has no macAddress"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:145
+#, php-format
+msgid "Could not get macAddress for \"%s\""
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:157
+#: addons/opsi/class_opsiImport.inc:98
+msgid "Could not update OPSI information"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:72
+msgid "Argonaut server is not available"
+msgstr ""
+
+#: 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 ""
diff --git a/opsi/locale/ar/fusiondirectory.po b/opsi/locale/ar/fusiondirectory.po
index 125501b4c884665cb297ec753f08d8b938017698..223fa917395e9af8841831538cc492d7b195ff98 100644
--- a/opsi/locale/ar/fusiondirectory.po
+++ b/opsi/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -27,80 +27,80 @@ msgstr ""
 msgid "OPSI software list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "الإسم"
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr ""
@@ -110,27 +110,27 @@ msgstr ""
 msgid "OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr ""
@@ -144,15 +144,15 @@ msgstr ""
 msgid "OPSI on demand software list"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr ""
 
@@ -219,45 +219,45 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:100
 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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr ""
diff --git a/opsi/locale/ca/fusiondirectory.po b/opsi/locale/ca/fusiondirectory.po
index 7fb1fab148d93ad21ef2374e264753352bd7d371..0744bdf32a9f85a22996d8ad096e4f55ffb6282c 100644
--- a/opsi/locale/ca/fusiondirectory.po
+++ b/opsi/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -27,80 +27,80 @@ msgstr ""
 msgid "OPSI software list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Nom"
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr ""
@@ -110,27 +110,27 @@ msgstr ""
 msgid "OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr ""
@@ -144,15 +144,15 @@ msgstr ""
 msgid "OPSI on demand software list"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr ""
 
@@ -219,45 +219,45 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:100
 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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr ""
diff --git a/opsi/locale/cs_CZ/fusiondirectory.po b/opsi/locale/cs_CZ/fusiondirectory.po
index b50571690863dce47c6ef4415cb65c968f6d32b2..385cea9caa672bdae3e878ae4439488cf834a7af 100644
--- a/opsi/locale/cs_CZ/fusiondirectory.po
+++ b/opsi/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/opsi/class_opsiSoftwareList.inc:32
 msgid "OPSI list"
@@ -27,81 +27,81 @@ msgstr "OPSI seznam"
 msgid "OPSI software list"
 msgstr "OPSI seznam programového vybavení"
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr "Informace"
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr "OPSI server"
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr "OPSI server pomocí kterého nasadit"
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "název"
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr "Název tohoto OPSI profilu"
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr "Programové vybavení"
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr ""
 "Produkty pro místní zavedení pro instalaci prostřednictvím tohoto seznamu"
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr "Produkty pro spuštění z vestavěného datového úložiště stroje"
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr "Nedaří se kontaktovat argonaut server"
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr "Žádná MAC adresa"
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr "Server %s nemá v LDAP uvedeny žádné MAC adresy"
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr "%s nelze v LDAP nalézt"
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr "Nezdařilo se kontaktovat OPSI server"
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr "%s (%s–%s)"
@@ -111,28 +111,28 @@ msgstr "%s (%s–%s)"
 msgid "OPSI profile"
 msgstr "Sada nastavení OPSI"
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr "Položky"
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr "Produkt pro místní zavedení"
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr "Netbot produkt pro tuto sadu nastavení"
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr "Seznamy programového vybavení"
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr ""
 "Seznam programového vybavení, který bude nainstalován touto sadou nastavení"
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -146,15 +146,15 @@ msgstr "OPSI seznam na vyžádání"
 msgid "OPSI on demand software list"
 msgstr "OPSI seznam na vyžádání: programové vybavení"
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr "Zobrazit podrobnosti"
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr "Zobrazit uživateli další informace"
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 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 "
@@ -223,45 +223,45 @@ msgstr "Klient OPSI"
 msgid "Edit OPSI client settings"
 msgstr "Upravit nastavení OPSI klienta"
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr "Klient OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr "OPSI server"
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 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:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr "Profil OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 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:100
 msgid "Could not get macAddress for OPSI server!"
 msgstr "Nedaří se získat MAC adresu pro OPSI server!"
 
-#: admin/systems/opsi/class_opsiClient.inc:105
-#: admin/systems/opsi/class_opsiClient.inc:193
+#: admin/systems/opsi/class_opsiClient.inc:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr "Nedaří se odebrat OPSI informaci"
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr "Člen nebyl nalezen nebo nemá nastaveno macAddress"
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr "Nedaří se získat macAddress pro „%s“"
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr "Nedaří se aktualizovat OPSI informaci"
diff --git a/opsi/locale/de/fusiondirectory.po b/opsi/locale/de/fusiondirectory.po
index 111f9f25633c408701582e697df09790625538a9..9b37d0ae25203f4e0bec41fd396a8162c5677fe2 100644
--- a/opsi/locale/de/fusiondirectory.po
+++ b/opsi/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -27,81 +27,81 @@ msgstr "OPSI-Liste"
 msgid "OPSI software list"
 msgstr "OPSI-Softwareliste"
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr "Infos"
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr "OPSI-Server"
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr "Der zu verwendende OPSI-Server"
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Name"
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr "Name von diesem OPSI-Profils"
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr "Software"
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr ""
 "Die Localboot Produkte, welche mit dieser Liste installiert werden sollen"
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr "Localboot Produkte"
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr "Keine Verbindung zum-Argonaut Server"
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr "Keine MAC-Adresse"
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr "Konnte %s nicht im LDAP finden"
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr ""
@@ -111,27 +111,27 @@ msgstr ""
 msgid "OPSI profile"
 msgstr "OPSI-Profil"
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr "Einträge"
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr "Netboot-Produkt"
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr "Das Netboot-Produkt, das in diesem Profil verwendet werden soll"
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr "Softwareliste"
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr "Softwareliste welche mit diesem Profil installiert wird"
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -145,15 +145,15 @@ msgstr "OPSI-Anforderungsliste"
 msgid "OPSI on demand software list"
 msgstr "OPSI auf der Anforderungssoftwareliste"
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr "Details anzeigen"
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr "Weiter Informationen zu diesem Benutzer anzeigen"
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr "Das Localboot Produkt, welches dieser Liste hinzugefügt werden soll"
 
@@ -220,45 +220,45 @@ msgstr "OPSI-Client"
 msgid "Edit OPSI client settings"
 msgstr "OPSI-Clienteinstellungen bearbeiten"
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr "OPSI-Client"
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr "OPSI-Server"
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 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:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr "OPSI-Profil"
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 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:100
 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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr ""
diff --git a/opsi/locale/el_GR/fusiondirectory.po b/opsi/locale/el_GR/fusiondirectory.po
index 540e2b15c0471c04564d1eeea1402a79bf9506f6..1756926b616433c4f936a07120f9f28a58e2953b 100644
--- a/opsi/locale/el_GR/fusiondirectory.po
+++ b/opsi/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -27,80 +27,80 @@ msgstr "Λίστα OPSI"
 msgid "OPSI software list"
 msgstr "Λίστα λογισμικού OPSI"
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr "Πληροφορίες"
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr "Διακομιστής OPSI"
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr "Ο διακομιστής OPSI που θα χρησιμοποιηθεί για την ανάπτυξη"
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Όνομα"
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr "Ονομασία αυτού του προφίλ OPSI"
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr "Λογισμικό"
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr "Τα προϊόντα τοπικής εκκίνησης που θα εγκατασταθούν με αυτήν τη λίστα"
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr "Προϊόντα τοπικής εκκίνησης"
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή argonaut"
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr "Δεν υπάρχει διεύθυνση MAC"
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr "Ο διακομιστής %s δεν έχει κάποια διεύθυνση MAC ρυθμισμένη στον LDAP"
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr "Δεν βρέθηκε ο %s στον LDAP"
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr "Αποτυχία σύνδεσης στον διακομιστή OPSI"
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr ""
@@ -110,27 +110,27 @@ msgstr ""
 msgid "OPSI profile"
 msgstr "Προφίλ OPSI"
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr "Καταχωρήσεις"
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr "Προϊόν δικτυακής εκκίνησης"
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr "Το προϊόν δικτυακής εκκίνησης που θα χρησιμοποιηθεί σε αυτό το προφίλ"
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr "Λίστες λογισμικού"
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr "Λίστες λογισμικού που θα εγκατασταθεί με αυτό το προφίλ"
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -144,15 +144,15 @@ msgstr "Κατάλογος κατά παραγγελία λογισμικού OP
 msgid "OPSI on demand software list"
 msgstr "Κατάλογος κατά παραγγελία λογισμικού OPSI "
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr "Εμφάνιση λεπτομερειών"
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr "Εμφάνιση επιπλέον λεπτομερειών στο χρήστη"
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr "Τα προϊόντα τοπικής εκκίνησης που θα μπουν σε αυτήν τη λίστα"
 
@@ -219,45 +219,45 @@ msgstr "Πελάτης OPSI"
 msgid "Edit OPSI client settings"
 msgstr "Επεξεργασία ρυθμίσεων του πελάτη OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr "Πελάτης OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr "Διακομιστής OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Server this client is connected to"
 msgstr "Ο διακομιστής OPSI που συνδέεται αυτός ο πελάτης"
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr "Προφίλ OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "The OPSI Profile to apply to this client"
 msgstr "Το προφίλ OPSI που θα εφαρμοστεί σε αυτόν τον πελάτη"
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:100
 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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr ""
diff --git a/opsi/locale/es/fusiondirectory.po b/opsi/locale/es/fusiondirectory.po
index bf54afebccd6b94356333aee41c2750c42ce0e22..24d1f56e1810ac0f92f81ccf65852fc41508040d 100644
--- a/opsi/locale/es/fusiondirectory.po
+++ b/opsi/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -27,80 +27,80 @@ msgstr ""
 msgid "OPSI software list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr ""
@@ -110,27 +110,27 @@ msgstr ""
 msgid "OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr ""
@@ -144,15 +144,15 @@ msgstr ""
 msgid "OPSI on demand software list"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr ""
 
@@ -219,45 +219,45 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:100
 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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr ""
diff --git a/opsi/locale/es_CO/fusiondirectory.po b/opsi/locale/es_CO/fusiondirectory.po
index b4d920c0d6bc44bd1af7d253da6fa37801f3d7a7..9d90898802a982bd81c2d6071e11a7d6f68a4ef4 100644
--- a/opsi/locale/es_CO/fusiondirectory.po
+++ b/opsi/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -27,80 +27,80 @@ msgstr ""
 msgid "OPSI software list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr ""
@@ -110,27 +110,27 @@ msgstr ""
 msgid "OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr ""
@@ -144,15 +144,15 @@ msgstr ""
 msgid "OPSI on demand software list"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr ""
 
@@ -219,45 +219,45 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:100
 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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr ""
diff --git a/opsi/locale/es_VE/fusiondirectory.po b/opsi/locale/es_VE/fusiondirectory.po
index bde24d44c2063a053d3fdafa6f642aefd21e0c90..23d77c92d866088054ccc0bb378004af1dce7ea8 100644
--- a/opsi/locale/es_VE/fusiondirectory.po
+++ b/opsi/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -27,80 +27,80 @@ msgstr ""
 msgid "OPSI software list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr ""
@@ -110,27 +110,27 @@ msgstr ""
 msgid "OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr ""
@@ -144,15 +144,15 @@ msgstr ""
 msgid "OPSI on demand software list"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr ""
 
@@ -219,45 +219,45 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:100
 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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr ""
diff --git a/opsi/locale/fa_IR/fusiondirectory.po b/opsi/locale/fa_IR/fusiondirectory.po
index d5a7935657d57cf1d394e9b5a7c019e34ecf4b2d..fa9c63722a1c85bc1779e7bd6180b92507c8ba9b 100644
--- a/opsi/locale/fa_IR/fusiondirectory.po
+++ b/opsi/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/opsi/class_opsiSoftwareList.inc:32
 msgid "OPSI list"
@@ -26,80 +26,80 @@ msgstr ""
 msgid "OPSI software list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr ""
@@ -109,27 +109,27 @@ msgstr ""
 msgid "OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr ""
@@ -143,15 +143,15 @@ msgstr ""
 msgid "OPSI on demand software list"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr ""
 
@@ -218,45 +218,45 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:100
 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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr ""
diff --git a/opsi/locale/fi_FI/fusiondirectory.po b/opsi/locale/fi_FI/fusiondirectory.po
index e0f821182b5117eaf4de9c05fce1ba2ec3e4e41d..19571fc82cf2f26a136f53ebb1135ad05e21db1f 100644
--- a/opsi/locale/fi_FI/fusiondirectory.po
+++ b/opsi/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
@@ -27,80 +27,80 @@ msgstr ""
 msgid "OPSI software list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Nimi"
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr ""
@@ -110,27 +110,27 @@ msgstr ""
 msgid "OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr ""
@@ -144,15 +144,15 @@ msgstr ""
 msgid "OPSI on demand software list"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr ""
 
@@ -219,45 +219,45 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:100
 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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr ""
diff --git a/opsi/locale/fr/fusiondirectory.po b/opsi/locale/fr/fusiondirectory.po
index cccc2c3ae6de1546c47b3d4d6bf114bddd007063..ba5596e42625dc350af300d5a6a93e2db610dc34 100644
--- a/opsi/locale/fr/fusiondirectory.po
+++ b/opsi/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
@@ -27,80 +27,80 @@ msgstr "Liste OPSI"
 msgid "OPSI software list"
 msgstr "Liste des logiciels OPSI"
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr "Informations"
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr "Serveur OPSI"
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr "Serveur OPSI a utiliser pour le déploiement"
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Nom"
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr "Nom du profil OPSI"
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr "Logiciels"
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr "Les produits localboot à installer avec cette liste"
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr "Produit localboot OPSI"
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr "Impossible de contacter le serveur Argonaut"
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr "Pas d'adresse mac"
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the 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
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr "Impossible de trouver %s dans l'annuaire LDAP"
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr "Impossible de contacter le serveur OPSI"
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr "%s (%s-%s)"
@@ -110,27 +110,27 @@ msgstr "%s (%s-%s)"
 msgid "OPSI profile"
 msgstr "Profil OPSI"
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr "Entrées"
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr "Produit netboot OPSI"
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr "Le produit netboot à utiliser pour ce profil"
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr "Liste des logiciels OPSI"
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr "Listes de logiciels qui seront installés avec ce profil"
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -144,15 +144,15 @@ msgstr "Liste ondemand OPSI"
 msgid "OPSI on demand software list"
 msgstr "Liste de logiciels à la demande OPSI"
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr "Montrer les détails"
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr "Montrer plus d'informations à ,l'utilisateur"
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr "Les produits localboot à mettre dans cette liste"
 
@@ -219,45 +219,45 @@ msgstr "Client OPSI"
 msgid "Edit OPSI client settings"
 msgstr " Édition des paramètres OPSI du client"
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr "Client OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr "Serveur OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Server this client is connected to"
 msgstr "Serveur OPSI sur lequel le client est connecté"
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr "Profil OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 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:100
 msgid "Could not get macAddress for OPSI server!"
 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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr "Effacement des informations OPSI impossible"
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr "Ce membre n'a pas été trouvé ou n'a pas d'adresse mac"
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr "Impossible d'obtenir l'adresse mac pour \"%s\""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr "Mise à jour des informations OPSI impossible"
diff --git a/opsi/locale/hu_HU/fusiondirectory.po b/opsi/locale/hu_HU/fusiondirectory.po
index c749756bab4b14e498ce41f3912446ae79fb8820..df22a3bad63162d59a8bc0c37f2a3fc3332d0049 100644
--- a/opsi/locale/hu_HU/fusiondirectory.po
+++ b/opsi/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -27,80 +27,80 @@ msgstr ""
 msgid "OPSI software list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Név"
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr ""
@@ -110,27 +110,27 @@ msgstr ""
 msgid "OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr ""
@@ -144,15 +144,15 @@ msgstr ""
 msgid "OPSI on demand software list"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr ""
 
@@ -219,45 +219,45 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:100
 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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr ""
diff --git a/opsi/locale/id/fusiondirectory.po b/opsi/locale/id/fusiondirectory.po
index f9d3b0f1621ae90d471ffe832615a2c5e07290c4..5245ef8f8170fa3a3ad0af877f4c950e8304c606 100644
--- a/opsi/locale/id/fusiondirectory.po
+++ b/opsi/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -26,80 +26,80 @@ msgstr ""
 msgid "OPSI software list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr ""
@@ -109,27 +109,27 @@ msgstr ""
 msgid "OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr ""
@@ -143,15 +143,15 @@ msgstr ""
 msgid "OPSI on demand software list"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr ""
 
@@ -218,45 +218,45 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:100
 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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr ""
diff --git a/opsi/locale/it_IT/fusiondirectory.po b/opsi/locale/it_IT/fusiondirectory.po
index a68f49b529a54c78481be33b0af4311a2bf72fed..ff9dc565844863eb147b28d05524e796b9a0830f 100644
--- a/opsi/locale/it_IT/fusiondirectory.po
+++ b/opsi/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
@@ -27,80 +27,80 @@ msgstr "Elenco OPSI"
 msgid "OPSI software list"
 msgstr "Elenco software OPSI"
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr "Informazioni"
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr "Server OPSI"
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr "Server OPSI da usare per la distribuzione"
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Nome"
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr "Nome di questo profilo OPSI"
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr "Softwares"
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr "I prodotti localboot da installare con questo elenco"
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr "Prodotti localboot"
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr "Non posso contattare il server Argonaut"
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr "Alcun indirizzo MAC"
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr "Il server %s non ha alcun indirizzo MAC configurato nell'LDAP"
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr "Impossibile trovare %s nell'annuario LDAP"
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr "Campo per contattare il server OPSI"
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr "1%s ( 1%s - 1%s )"
@@ -110,27 +110,27 @@ msgstr "1%s ( 1%s - 1%s )"
 msgid "OPSI profile"
 msgstr "Profilo OPSI"
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr "Voci"
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr "Prodotto netboot"
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr "Il prodotto Netboot da usare per questo profilo"
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr "Elenco dei software"
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr "Elenco dei software da installare con questo profilo"
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -144,15 +144,15 @@ msgstr "Lista OPSI ondemand"
 msgid "OPSI on demand software list"
 msgstr "Elenco software OPSI ondemand"
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr "Mostra dettagli"
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr "Mostra ulteriori informazioni all'utente"
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr "I prodotti LOCALBOOT da mettere in questa lista"
 
@@ -219,45 +219,45 @@ msgstr "Cliente OPSI"
 msgid "Edit OPSI client settings"
 msgstr "Modifica le impostazioni del cliente OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr "Cliente OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr "Server OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Server this client is connected to"
 msgstr "Il server OPSI al quale questo cliente è connesso"
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr "Profilo OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 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:100
 msgid "Could not get macAddress for OPSI server!"
 msgstr "Impossibile ottenere l'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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr "Impossibile rimuovere informazioni su OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr "Questo membro non è stato trovato o non ha indirizzo MAC"
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr "Impossibile ottenere l'indirizzo MAC per \"%s\""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr "Impossibile aggiornare le informazioni di OPSI"
diff --git a/opsi/locale/ja/fusiondirectory.po b/opsi/locale/ja/fusiondirectory.po
index 0d1bc8895908d531fb14f008c685869e16511a5f..7eb2be6a650a3295a2242124ffd001335f5b4e55 100644
--- a/opsi/locale/ja/fusiondirectory.po
+++ b/opsi/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -26,80 +26,80 @@ msgstr ""
 msgid "OPSI software list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr ""
@@ -109,27 +109,27 @@ msgstr ""
 msgid "OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr ""
@@ -143,15 +143,15 @@ msgstr ""
 msgid "OPSI on demand software list"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr ""
 
@@ -218,45 +218,45 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:100
 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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr ""
diff --git a/opsi/locale/ko/fusiondirectory.po b/opsi/locale/ko/fusiondirectory.po
index 09b00f8e693ad988e2a7801f9fa83d605daacd9d..f70cc70296d719f479a6e1eb841d2fdf2a258744 100644
--- a/opsi/locale/ko/fusiondirectory.po
+++ b/opsi/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
@@ -27,80 +27,80 @@ msgstr ""
 msgid "OPSI software list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "명칭"
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr ""
@@ -110,27 +110,27 @@ msgstr ""
 msgid "OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr "항목"
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr "%s(%s)"
@@ -144,15 +144,15 @@ msgstr ""
 msgid "OPSI on demand software list"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr ""
 
@@ -219,45 +219,45 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:100
 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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr ""
diff --git a/opsi/locale/lv/fusiondirectory.po b/opsi/locale/lv/fusiondirectory.po
index ae7966e0b48e4f7a8e3169260ab2798cea5543e8..e3243bf1271ea072d841abed0f297fe23b2c608a 100644
--- a/opsi/locale/lv/fusiondirectory.po
+++ b/opsi/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -27,80 +27,80 @@ msgstr ""
 msgid "OPSI software list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Vārds "
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr ""
@@ -110,27 +110,27 @@ msgstr ""
 msgid "OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr ""
@@ -144,15 +144,15 @@ msgstr ""
 msgid "OPSI on demand software list"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr ""
 
@@ -219,45 +219,45 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:100
 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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr ""
diff --git a/opsi/locale/nb/fusiondirectory.po b/opsi/locale/nb/fusiondirectory.po
index 76e6e839a4b6840da4b8ed6359c7e30e1bf844c7..9fe159fd5d620f1a086ddebdab994380ef93eccd 100644
--- a/opsi/locale/nb/fusiondirectory.po
+++ b/opsi/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -27,80 +27,80 @@ msgstr ""
 msgid "OPSI software list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Navn"
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr ""
@@ -110,27 +110,27 @@ msgstr ""
 msgid "OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr ""
@@ -144,15 +144,15 @@ msgstr ""
 msgid "OPSI on demand software list"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr ""
 
@@ -219,45 +219,45 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:100
 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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr ""
diff --git a/opsi/locale/nl/fusiondirectory.po b/opsi/locale/nl/fusiondirectory.po
index c572189b2e4b870f231ec310796f0f88e6ae749f..dbb48de37a50100451c76e46a2a4f98e26b7c0bb 100644
--- a/opsi/locale/nl/fusiondirectory.po
+++ b/opsi/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
@@ -27,80 +27,80 @@ msgstr "OPSI lijst"
 msgid "OPSI software list"
 msgstr "OPSI software lijst"
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr "OPSI server"
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Naam"
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr "Geen MAC-adres"
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr "Kan %s niet vinden in de LDAP"
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr "Kan de OPSI server niet bereiken"
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr ""
@@ -110,27 +110,27 @@ msgstr ""
 msgid "OPSI profile"
 msgstr "OPSI profiel"
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr "Software lijsten"
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -144,15 +144,15 @@ msgstr ""
 msgid "OPSI on demand software list"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr "Toon de details"
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr ""
 
@@ -219,45 +219,45 @@ msgstr "OPSI client"
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr "OPSI client"
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr "OPSI server"
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr "OPSI profiel"
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:100
 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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr "Kan de OPSI informatie niet updaten"
diff --git a/opsi/locale/pl/fusiondirectory.po b/opsi/locale/pl/fusiondirectory.po
index 6e437f184c043e27a685d18d692fa36423929275..48d198c90dac2c62d1f752d65f213237bc3c59df 100644
--- a/opsi/locale/pl/fusiondirectory.po
+++ b/opsi/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -27,80 +27,80 @@ msgstr ""
 msgid "OPSI software list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "ImiÄ™"
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr ""
@@ -110,27 +110,27 @@ msgstr ""
 msgid "OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr ""
@@ -144,15 +144,15 @@ msgstr ""
 msgid "OPSI on demand software list"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr ""
 
@@ -219,45 +219,45 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:100
 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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr ""
diff --git a/opsi/locale/pt/fusiondirectory.po b/opsi/locale/pt/fusiondirectory.po
index 8e99741f5afe8947b31fd5f83ec6a28491544192..21d74a22b3361bac765a9a5ad2542d8ac35200d3 100644
--- a/opsi/locale/pt/fusiondirectory.po
+++ b/opsi/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -27,80 +27,80 @@ msgstr ""
 msgid "OPSI software list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Nome"
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr ""
@@ -110,27 +110,27 @@ msgstr ""
 msgid "OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr ""
@@ -144,15 +144,15 @@ msgstr ""
 msgid "OPSI on demand software list"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr ""
 
@@ -219,45 +219,45 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:100
 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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr ""
diff --git a/opsi/locale/pt_BR/fusiondirectory.po b/opsi/locale/pt_BR/fusiondirectory.po
index 4936cc72a45e8372d214580ab963877453acce12..1da9159192b28017f78635046e59ed0593127e37 100644
--- a/opsi/locale/pt_BR/fusiondirectory.po
+++ b/opsi/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -27,80 +27,80 @@ msgstr ""
 msgid "OPSI software list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Nome"
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr ""
@@ -110,27 +110,27 @@ msgstr ""
 msgid "OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr "Entradas"
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr "%s(%s)"
@@ -144,15 +144,15 @@ msgstr ""
 msgid "OPSI on demand software list"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr ""
 
@@ -219,45 +219,45 @@ msgstr "Cliente OPSI"
 msgid "Edit OPSI client settings"
 msgstr "Editar configurações de cliente OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr "Cliente OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr "Servidor OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Server this client is connected to"
 msgstr "O Servidor OPSI que este cliente está conectado"
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:100
 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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr ""
diff --git a/opsi/locale/ru/fusiondirectory.po b/opsi/locale/ru/fusiondirectory.po
index 85ce73356876f0c45cf660cac80dfc77ee5690d3..4f347feceab5e17bd03716dc2e58c5b65663937d 100644
--- a/opsi/locale/ru/fusiondirectory.po
+++ b/opsi/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -27,80 +27,80 @@ msgstr ""
 msgid "OPSI software list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Фамилия"
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr ""
@@ -110,27 +110,27 @@ msgstr ""
 msgid "OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -144,15 +144,15 @@ msgstr ""
 msgid "OPSI on demand software list"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr ""
 
@@ -219,45 +219,45 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:100
 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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr ""
diff --git a/opsi/locale/ru@petr1708/fusiondirectory.po b/opsi/locale/ru@petr1708/fusiondirectory.po
index 3a2c7791bb75d55e9f57fb9d5010f5be29b49750..50e768983e2a66340e0330517d2554e04e42ad32 100644
--- a/opsi/locale/ru@petr1708/fusiondirectory.po
+++ b/opsi/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -26,80 +26,80 @@ msgstr ""
 msgid "OPSI software list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr ""
@@ -109,27 +109,27 @@ msgstr ""
 msgid "OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr ""
@@ -143,15 +143,15 @@ msgstr ""
 msgid "OPSI on demand software list"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr ""
 
@@ -218,45 +218,45 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:100
 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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr ""
diff --git a/opsi/locale/sv/fusiondirectory.po b/opsi/locale/sv/fusiondirectory.po
index 1939297f3701850e7422582eb2c4bde63b7b4a14..3181e445330b92719856879043d5c2a70d6a80c1 100644
--- a/opsi/locale/sv/fusiondirectory.po
+++ b/opsi/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -27,80 +27,80 @@ msgstr ""
 msgid "OPSI software list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Namn"
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr ""
@@ -110,27 +110,27 @@ msgstr ""
 msgid "OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr ""
@@ -144,15 +144,15 @@ msgstr ""
 msgid "OPSI on demand software list"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr ""
 
@@ -219,45 +219,45 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:100
 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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr ""
diff --git a/opsi/locale/tr_TR/fusiondirectory.po b/opsi/locale/tr_TR/fusiondirectory.po
index 66bdcf8963e57647f481c79d48107b154760a41c..3d332ceb2d2dc050ffd1190949b7e8a5c2669fed 100644
--- a/opsi/locale/tr_TR/fusiondirectory.po
+++ b/opsi/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
@@ -26,80 +26,80 @@ msgstr ""
 msgid "OPSI software list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr ""
@@ -109,27 +109,27 @@ msgstr ""
 msgid "OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr ""
@@ -143,15 +143,15 @@ msgstr ""
 msgid "OPSI on demand software list"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr ""
 
@@ -218,45 +218,45 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:100
 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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr ""
diff --git a/opsi/locale/ug/fusiondirectory.po b/opsi/locale/ug/fusiondirectory.po
index 931f84d7453b3dd2bbbc1790fbed6702b2cef3cc..bff578ead3f8ecfd72ed6d799bb4b54bb3068877 100644
--- a/opsi/locale/ug/fusiondirectory.po
+++ b/opsi/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -26,80 +26,80 @@ msgstr ""
 msgid "OPSI software list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr ""
@@ -109,27 +109,27 @@ msgstr ""
 msgid "OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr ""
@@ -143,15 +143,15 @@ msgstr ""
 msgid "OPSI on demand software list"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr ""
 
@@ -218,45 +218,45 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:100
 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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr ""
diff --git a/opsi/locale/vi_VN/fusiondirectory.po b/opsi/locale/vi_VN/fusiondirectory.po
index db363cd1c76feb072f98c64fcc2aaed87a311eeb..41850923fe1c9754e96a68d69cdac090de71395a 100644
--- a/opsi/locale/vi_VN/fusiondirectory.po
+++ b/opsi/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -27,80 +27,80 @@ msgstr ""
 msgid "OPSI software list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Tên"
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr ""
@@ -110,27 +110,27 @@ msgstr ""
 msgid "OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr ""
@@ -144,15 +144,15 @@ msgstr ""
 msgid "OPSI on demand software list"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr ""
 
@@ -219,45 +219,45 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:100
 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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr ""
diff --git a/opsi/locale/zh/fusiondirectory.po b/opsi/locale/zh/fusiondirectory.po
index 4f1c801017999530c8c4250eb14e07dcc719189d..801578c20faae470056898837fe1be61686173ec 100644
--- a/opsi/locale/zh/fusiondirectory.po
+++ b/opsi/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -27,80 +27,80 @@ msgstr ""
 msgid "OPSI software list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:51
-#: admin/opsi/class_opsiOnDemandList.inc:47
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
 msgid "Infos"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:54
-#: admin/opsi/class_opsiProfile.inc:89
-#: admin/opsi/class_opsiOnDemandList.inc:50
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
 msgid "OPSI server to use for deployment"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 #: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "名称"
 
-#: admin/opsi/class_opsiSoftwareList.inc:58
-#: admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiOnDemandList.inc:54
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
 msgid "Name of this OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:64
-#: admin/opsi/class_opsiOnDemandList.inc:64
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
 msgid "Softwares"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:71
 msgid "The localboot products to install with this list"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:81
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "Localboot products"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:110
-#: admin/opsi/class_opsiProfile.inc:155
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
 #: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:122
-#: admin/opsi/class_opsiProfile.inc:167 addons/opsi/class_opsiImport.inc:83
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
 msgid "No mac address"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:123
-#: admin/opsi/class_opsiProfile.inc:168
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:129
-#: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
 #, php-format
 msgid "Could not find %s in the LDAP"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:137
-#: admin/opsi/class_opsiProfile.inc:182
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
 #: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
-#: admin/opsi/class_opsiSoftwareList.inc:149
+#: admin/opsi/class_opsiSoftwareList.inc:152
 #, php-format
 msgid "%s (%s-%s)"
 msgstr ""
@@ -110,27 +110,27 @@ msgstr ""
 msgid "OPSI profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:99
+#: admin/opsi/class_opsiProfile.inc:103
 msgid "Entries"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "Netboot product"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:102
+#: admin/opsi/class_opsiProfile.inc:106
 msgid "The netboot product to use for this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:107
+#: admin/opsi/class_opsiProfile.inc:111
 msgid "Software lists that will be installed with this profile"
 msgstr ""
 
-#: admin/opsi/class_opsiProfile.inc:202
+#: admin/opsi/class_opsiProfile.inc:206
 #, php-format
 msgid "%s (%s)"
 msgstr ""
@@ -144,15 +144,15 @@ msgstr ""
 msgid "OPSI on demand software list"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show details"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:58
+#: admin/opsi/class_opsiOnDemandList.inc:61
 msgid "Show further information to the user"
 msgstr ""
 
-#: admin/opsi/class_opsiOnDemandList.inc:68
+#: admin/opsi/class_opsiOnDemandList.inc:71
 msgid "The localboot products to put in this list"
 msgstr ""
 
@@ -219,45 +219,45 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:48
+#: admin/systems/opsi/class_opsiClient.inc:52
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:51
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:55
+#: admin/systems/opsi/class_opsiClient.inc:59
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:100
 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:109
+#: admin/systems/opsi/class_opsiClient.inc:197
 msgid "Could not remove OPSI information"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:136
+#: admin/systems/opsi/class_opsiClient.inc:140
 msgid "This member was not found or has no macAddress"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:141
+#: admin/systems/opsi/class_opsiClient.inc:145
 #, php-format
 msgid "Could not get macAddress for \"%s\""
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:153
+#: admin/systems/opsi/class_opsiClient.inc:157
 #: addons/opsi/class_opsiImport.inc:98
 msgid "Could not update OPSI information"
 msgstr ""
diff --git a/opsi/locale/zh_TW/fusiondirectory.po b/opsi/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..2fd5899ef222a3c79ff9a009a33b664969352c85
--- /dev/null
+++ b/opsi/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,297 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/opsi/class_opsiSoftwareList.inc:32
+msgid "OPSI list"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:33
+#: admin/opsi/class_opsiSoftwareList.inc:37
+msgid "OPSI software list"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:54
+#: admin/opsi/class_opsiOnDemandList.inc:50
+msgid "Infos"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
+msgid "OPSI server"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:57
+#: admin/opsi/class_opsiProfile.inc:93
+#: admin/opsi/class_opsiOnDemandList.inc:53
+msgid "OPSI server to use for deployment"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:90 admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
+#: admin/opsi/class_opsiProductProperties.inc:113
+msgid "Name"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:61
+#: admin/opsi/class_opsiProfile.inc:97
+#: admin/opsi/class_opsiOnDemandList.inc:57
+msgid "Name of this OPSI profile"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:67
+#: admin/opsi/class_opsiOnDemandList.inc:67
+msgid "Softwares"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:71
+msgid "The localboot products to install with this list"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:84
+#: admin/opsi/class_opsiOnDemandList.inc:71
+msgid "Localboot products"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:113
+#: admin/opsi/class_opsiProfile.inc:159
+#: admin/opsi/class_opsiProductProperties.inc:174
+msgid "Could not contact argonaut server"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:125
+#: admin/opsi/class_opsiProfile.inc:171 addons/opsi/class_opsiImport.inc:83
+msgid "No mac address"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:126
+#: admin/opsi/class_opsiProfile.inc:172
+#, php-format
+msgid "Server %s has no mac address configured in the LDAP"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:132
+#: admin/opsi/class_opsiProfile.inc:143 admin/opsi/class_opsiProfile.inc:178
+#, php-format
+msgid "Could not find %s in the LDAP"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:140
+#: admin/opsi/class_opsiProfile.inc:186
+#: admin/opsi/class_opsiProductProperties.inc:190
+msgid "Failed to contact OPSI server"
+msgstr ""
+
+#: admin/opsi/class_opsiSoftwareList.inc:152
+#, php-format
+msgid "%s (%s-%s)"
+msgstr ""
+
+#: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
+#: admin/opsi/class_opsiProfile.inc:72
+msgid "OPSI profile"
+msgstr ""
+
+#: admin/opsi/class_opsiProfile.inc:103
+msgid "Entries"
+msgstr ""
+
+#: admin/opsi/class_opsiProfile.inc:106
+msgid "Netboot product"
+msgstr ""
+
+#: admin/opsi/class_opsiProfile.inc:106
+msgid "The netboot product to use for this profile"
+msgstr ""
+
+#: admin/opsi/class_opsiProfile.inc:111
+msgid "Software lists"
+msgstr ""
+
+#: admin/opsi/class_opsiProfile.inc:111
+msgid "Software lists that will be installed with this profile"
+msgstr ""
+
+#: admin/opsi/class_opsiProfile.inc:206
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: admin/opsi/class_opsiOnDemandList.inc:28
+#: admin/opsi/class_opsiOnDemandList.inc:33
+msgid "OPSI ondemand list"
+msgstr ""
+
+#: admin/opsi/class_opsiOnDemandList.inc:29
+msgid "OPSI on demand software list"
+msgstr ""
+
+#: admin/opsi/class_opsiOnDemandList.inc:61
+msgid "Show details"
+msgstr ""
+
+#: admin/opsi/class_opsiOnDemandList.inc:61
+msgid "Show further information to the user"
+msgstr ""
+
+#: admin/opsi/class_opsiOnDemandList.inc:71
+msgid "The localboot products to put in this list"
+msgstr ""
+
+#: admin/opsi/class_opsiProfileManagement.inc:33
+#: config/opsi/class_opsiConfig.inc:42
+msgid "OPSI"
+msgstr ""
+
+#: admin/opsi/class_opsiProfileManagement.inc:34
+msgid "OPSI profile management"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
+msgid "Product properties"
+msgstr ""
+
+#: admin/opsi/class_opsiProductProperties.inc:118
+msgid "Properties of the products of this profile"
+msgstr ""
+
+#: admin/systems/services/opsi/class_serviceOPSI.inc:29
+#: admin/systems/services/opsi/class_serviceOPSI.inc:30
+msgid "OPSI service"
+msgstr ""
+
+#: admin/systems/services/opsi/class_serviceOPSI.inc:30
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/opsi/class_serviceOPSI.inc:41
+msgid "OPSI Server information"
+msgstr ""
+
+#: admin/systems/services/opsi/class_serviceOPSI.inc:44
+msgid "Server URI"
+msgstr ""
+
+#: admin/systems/services/opsi/class_serviceOPSI.inc:44
+msgid "The URI to use for connection"
+msgstr ""
+
+#: admin/systems/services/opsi/class_serviceOPSI.inc:48
+msgid "User"
+msgstr ""
+
+#: admin/systems/services/opsi/class_serviceOPSI.inc:48
+msgid "The user to use for connection"
+msgstr ""
+
+#: admin/systems/services/opsi/class_serviceOPSI.inc:52
+msgid "Password"
+msgstr ""
+
+#: admin/systems/services/opsi/class_serviceOPSI.inc:52
+msgid "The password to use for connection"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:33
+msgid "OPSI client"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:34
+msgid "Edit OPSI client settings"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:52
+msgid "OPSI Client"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:55
+msgid "OPSI Server"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:55
+msgid "The OPSI Server this client is connected to"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:59
+msgid "OPSI Profile"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:59
+msgid "The OPSI Profile to apply to this client"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:100
+msgid "Could not get macAddress for OPSI server!"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:109
+#: admin/systems/opsi/class_opsiClient.inc:197
+msgid "Could not remove OPSI information"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:140
+msgid "This member was not found or has no macAddress"
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:145
+#, php-format
+msgid "Could not get macAddress for \"%s\""
+msgstr ""
+
+#: admin/systems/opsi/class_opsiClient.inc:157
+#: addons/opsi/class_opsiImport.inc:98
+msgid "Could not update OPSI information"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:28
+msgid "OPSI configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:29
+msgid "FusionDirectory OPSI plugin configuration"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "OPSI RDN"
+msgstr ""
+
+#: config/opsi/class_opsiConfig.inc:45
+msgid "Branch in which OPSI profiles will be stored"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
+msgid "OPSI import"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:31
+msgid "Import windows stations from OPSI into FD"
+msgstr ""
+
+#: addons/opsi/class_opsiImport.inc:72
+msgid "Argonaut server is not available"
+msgstr ""
+
+#: 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 ""
diff --git a/personal/locale/af_ZA/fusiondirectory.po b/personal/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..f62509c36f066d3106a99ba447949374e8895d07
--- /dev/null
+++ b/personal/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,171 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: config/personal/class_personalConfig.inc:28
+msgid "Personal configuration"
+msgstr ""
+
+#: config/personal/class_personalConfig.inc:29
+msgid "FusionDirectory personal plugin configuration"
+msgstr ""
+
+#: config/personal/class_personalConfig.inc:42
+#: personal/personal/class_personalInfo.inc:85
+msgid "Personal"
+msgstr ""
+
+#: config/personal/class_personalConfig.inc:45
+msgid "Allow use of private email for password recovery"
+msgstr ""
+
+#: config/personal/class_personalConfig.inc:45
+msgid "Allow users to use their private email address for password recovery"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:30
+msgid "Site"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:30
+msgid "Website the account is on"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:36
+msgid "Id"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:36
+msgid "Id of this user on this website"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:86
+msgid "Personal information"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:101
+msgid "Personal info"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:104
+msgid "Personal title"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:104
+msgid "Personal title - Examples of personal titles are \"Ms\", \"Dr\", \"Prof\" and \"Rev\""
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:109
+msgid "Nickname"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:109
+msgid "Nicknames for this user"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:114
+msgid "Badge Number"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:114
+msgid "Company badge number"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:118
+msgid "Date of birth"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:123
+msgid "Sex"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:123
+msgid "Gender"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:128
+msgid "Country"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:132
+msgid "Start date"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:132
+msgid "Date this user joined the company"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:137
+msgid "End date"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:137
+msgid "Date this user is supposed to leave the company"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:148
+msgid "Contact"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:152
+msgid "Social account"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:152
+msgid "Social accounts of this user"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:159
+msgid "Private email"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:159
+msgid "Private email addresses of this user"
+msgstr ""
+
+#: personal/personal/class_socialHandlers.inc:68
+msgid "Facebook"
+msgstr ""
+
+#: personal/personal/class_socialHandlers.inc:78
+msgid "Twitter"
+msgstr ""
+
+#: personal/personal/class_socialHandlers.inc:98
+msgid "Google+"
+msgstr ""
+
+#: personal/personal/class_socialHandlers.inc:118
+msgid "Diaspora*"
+msgstr ""
+
+#: personal/personal/class_socialHandlers.inc:131
+msgid "Diaspora accounts must look like user@pod"
+msgstr ""
+
+#: personal/personal/class_socialHandlers.inc:141
+msgid "LinkedIn"
+msgstr ""
diff --git a/personal/locale/ar/fusiondirectory.po b/personal/locale/ar/fusiondirectory.po
index e0a8c657be7feb275777723cf4dba82443b9df45..95c41e44b8fde9b327106c90c323f28d4ff78301 100644
--- a/personal/locale/ar/fusiondirectory.po
+++ b/personal/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/personal/locale/ca/fusiondirectory.po b/personal/locale/ca/fusiondirectory.po
index efb8b71250e4e88d962aa6da949f7535751724b6..2608c10ce229df28573485b1fd8df2e91e61fa5b 100644
--- a/personal/locale/ca/fusiondirectory.po
+++ b/personal/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/personal/locale/cs_CZ/fusiondirectory.po b/personal/locale/cs_CZ/fusiondirectory.po
index 580f1da6670814b96940d4c8989288a0a9fdc060..f71919dc3ab1ddcabc4fece2896780fc2c33e7b6 100644
--- a/personal/locale/cs_CZ/fusiondirectory.po
+++ b/personal/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: config/personal/class_personalConfig.inc:28
 msgid "Personal configuration"
diff --git a/personal/locale/de/fusiondirectory.po b/personal/locale/de/fusiondirectory.po
index 4af5ed96d3e7d784d5f7ca6f08015f62fc609f8b..7cd5b936cc95caf6c825cfcbd4b40f862b22f8af 100644
--- a/personal/locale/de/fusiondirectory.po
+++ b/personal/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/personal/locale/el_GR/fusiondirectory.po b/personal/locale/el_GR/fusiondirectory.po
index b297b7c3424053d229a0920337b4e7c4d3568d90..e8b5bb59b84ea90e952a3037fd3b6015f5ff3268 100644
--- a/personal/locale/el_GR/fusiondirectory.po
+++ b/personal/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/personal/locale/es/fusiondirectory.po b/personal/locale/es/fusiondirectory.po
index 040bf521319f96d5f4473772b88a5a55d8913283..c82d13a02b65a05bb440f7ea725439ca0a1dd7fc 100644
--- a/personal/locale/es/fusiondirectory.po
+++ b/personal/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/personal/locale/es_CO/fusiondirectory.po b/personal/locale/es_CO/fusiondirectory.po
index 1a6bc257ced555583338586ee0d9f34f67887875..16cfe0ae239b454538c71d4bb55cb3db31ea83c1 100644
--- a/personal/locale/es_CO/fusiondirectory.po
+++ b/personal/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/personal/locale/es_VE/fusiondirectory.po b/personal/locale/es_VE/fusiondirectory.po
index 0d95520364ea06f4d8109bb7de18a79ecab5fd05..cd0b1f3ae2fc831b7c150298fc6590e4887dece3 100644
--- a/personal/locale/es_VE/fusiondirectory.po
+++ b/personal/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/personal/locale/fa_IR/fusiondirectory.po b/personal/locale/fa_IR/fusiondirectory.po
index bbf6383fc6042cf4608c5ba35cce5bfe32192f37..be32355d6ea0a23bc016b4cc72775f389491554d 100644
--- a/personal/locale/fa_IR/fusiondirectory.po
+++ b/personal/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa_IR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: config/personal/class_personalConfig.inc:28
 msgid "Personal configuration"
diff --git a/personal/locale/fi_FI/fusiondirectory.po b/personal/locale/fi_FI/fusiondirectory.po
index 0f85d3f3ffc76a63d5a96764f8cb06fe0fdf802d..912f110028bd6de6cb8ce5d0c67b50fe34e9e0c5 100644
--- a/personal/locale/fi_FI/fusiondirectory.po
+++ b/personal/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/personal/locale/fr/fusiondirectory.po b/personal/locale/fr/fusiondirectory.po
index a86c6bbb2cf71dd08e3908f940704091603020b1..7699b9d035eadeefad1df1e599decf401e932941 100644
--- a/personal/locale/fr/fusiondirectory.po
+++ b/personal/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/personal/locale/hu_HU/fusiondirectory.po b/personal/locale/hu_HU/fusiondirectory.po
index 309bbe33da23b75f8433da1eb1645e996c43d34a..b7d9b8cc3fc7e6e49e0a3be1614da6c00a00429d 100644
--- a/personal/locale/hu_HU/fusiondirectory.po
+++ b/personal/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/personal/locale/id/fusiondirectory.po b/personal/locale/id/fusiondirectory.po
index 9682a794999d03ec25d6137b6a166602b5f55ef0..d529f76969964b33fc78596b442c4516030c332c 100644
--- a/personal/locale/id/fusiondirectory.po
+++ b/personal/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/personal/locale/it_IT/fusiondirectory.po b/personal/locale/it_IT/fusiondirectory.po
index 4c8bc5d361ac59387198601c8ee86d95c71787e5..9567600409416d72859339b03a93195ffb38d55a 100644
--- a/personal/locale/it_IT/fusiondirectory.po
+++ b/personal/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/personal/locale/ja/fusiondirectory.po b/personal/locale/ja/fusiondirectory.po
index bcd2d26ab018d892a063c645158cba51b744d4cb..fda162ef7dca64b0182a92fa2517433054850129 100644
--- a/personal/locale/ja/fusiondirectory.po
+++ b/personal/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/personal/locale/ko/fusiondirectory.po b/personal/locale/ko/fusiondirectory.po
index 99c017fcaced0398ff3123bdd30ec7c7d09dd66e..e70c4d6ce3df132479f709160ab4a288e88727eb 100644
--- a/personal/locale/ko/fusiondirectory.po
+++ b/personal/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
@@ -20,44 +20,44 @@ msgstr ""
 
 #: config/personal/class_personalConfig.inc:28
 msgid "Personal configuration"
-msgstr ""
+msgstr "개인화 설정"
 
 #: config/personal/class_personalConfig.inc:29
 msgid "FusionDirectory personal plugin configuration"
-msgstr ""
+msgstr "FusionDirectory 개인화 플러그인 설정"
 
 #: config/personal/class_personalConfig.inc:42
 #: personal/personal/class_personalInfo.inc:85
 msgid "Personal"
-msgstr ""
+msgstr "í™”"
 
 #: 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 "패스워드 복구를 위해 개인 이메일을 사용하도록 허용"
 
 #: personal/personal/class_personalInfo.inc:30
 msgid "Site"
-msgstr ""
+msgstr "사이트"
 
 #: personal/personal/class_personalInfo.inc:30
 msgid "Website the account is on"
-msgstr ""
+msgstr "웹사이트의 계정"
 
 #: personal/personal/class_personalInfo.inc:36
 msgid "Id"
-msgstr ""
+msgstr "아이디"
 
 #: personal/personal/class_personalInfo.inc:36
 msgid "Id of this user on this website"
-msgstr ""
+msgstr "웹사이트의 사용자 아이디"
 
 #: personal/personal/class_personalInfo.inc:86
 msgid "Personal information"
-msgstr ""
+msgstr "개인 정보"
 
 #: personal/personal/class_personalInfo.inc:101
 msgid "Personal info"
@@ -65,39 +65,39 @@ msgstr "개인정보"
 
 #: personal/personal/class_personalInfo.inc:104
 msgid "Personal title"
-msgstr ""
+msgstr "개인 타이틀"
 
 #: personal/personal/class_personalInfo.inc:104
 msgid "Personal title - Examples of personal titles are \"Ms\", \"Dr\", \"Prof\" and \"Rev\""
-msgstr ""
+msgstr "개인 타이틀 - 예를 들어 \"Ms\",. \"Dr\", \"Prof\" 또는 \"Rev\""
 
 #: personal/personal/class_personalInfo.inc:109
 msgid "Nickname"
-msgstr ""
+msgstr "별칭"
 
 #: personal/personal/class_personalInfo.inc:109
 msgid "Nicknames for this user"
-msgstr ""
+msgstr "사용자 별칭"
 
 #: personal/personal/class_personalInfo.inc:114
 msgid "Badge Number"
-msgstr ""
+msgstr "배치 번호"
 
 #: personal/personal/class_personalInfo.inc:114
 msgid "Company badge number"
-msgstr ""
+msgstr "회사 뱃지번호"
 
 #: personal/personal/class_personalInfo.inc:118
 msgid "Date of birth"
-msgstr ""
+msgstr "생년월일"
 
 #: personal/personal/class_personalInfo.inc:123
 msgid "Sex"
-msgstr ""
+msgstr "성별"
 
 #: personal/personal/class_personalInfo.inc:123
 msgid "Gender"
-msgstr ""
+msgstr "성별"
 
 #: personal/personal/class_personalInfo.inc:128
 msgid "Country"
@@ -109,7 +109,7 @@ msgstr "시작일자"
 
 #: personal/personal/class_personalInfo.inc:132
 msgid "Date this user joined the company"
-msgstr ""
+msgstr "입사일"
 
 #: personal/personal/class_personalInfo.inc:137
 msgid "End date"
@@ -117,15 +117,15 @@ msgstr "종료일자"
 
 #: personal/personal/class_personalInfo.inc:137
 msgid "Date this user is supposed to leave the company"
-msgstr ""
+msgstr "퇴사일"
 
 #: personal/personal/class_personalInfo.inc:142
 msgid "Photo Visible"
-msgstr ""
+msgstr "사진표시"
 
 #: personal/personal/class_personalInfo.inc:142
 msgid "Should the photo of the user be visible on external tools"
-msgstr ""
+msgstr "외부도구를 이용하여 사진 표시"
 
 #: personal/personal/class_personalInfo.inc:148
 msgid "Contact"
@@ -133,40 +133,40 @@ msgstr "연락처"
 
 #: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
-msgstr ""
+msgstr "소셜 계정"
 
 #: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
-msgstr ""
+msgstr "이 사용자의 소셜 계정"
 
 #: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
-msgstr ""
+msgstr "비공개 이메일"
 
 #: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
-msgstr ""
+msgstr "이 사용자의 비공개 이메일 주소"
 
 #: personal/personal/class_socialHandlers.inc:68
 msgid "Facebook"
-msgstr ""
+msgstr "페이스북"
 
 #: personal/personal/class_socialHandlers.inc:78
 msgid "Twitter"
-msgstr ""
+msgstr "트위터"
 
 #: personal/personal/class_socialHandlers.inc:98
 msgid "Google+"
-msgstr ""
+msgstr "구글+"
 
 #: personal/personal/class_socialHandlers.inc:118
 msgid "Diaspora*"
-msgstr ""
+msgstr "Diaspora*"
 
 #: personal/personal/class_socialHandlers.inc:131
 msgid "Diaspora accounts must look like user@pod"
-msgstr ""
+msgstr "Diaspora 계정은 user@pod처럼 보입니다."
 
 #: personal/personal/class_socialHandlers.inc:141
 msgid "LinkedIn"
-msgstr ""
+msgstr "링크드인"
diff --git a/personal/locale/lv/fusiondirectory.po b/personal/locale/lv/fusiondirectory.po
index 8e0ddedd789a0386ee04bf798ea3cb125264277c..9bc6b3be8f2b90bd384ee56cac80733c7b946b1f 100644
--- a/personal/locale/lv/fusiondirectory.po
+++ b/personal/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/personal/locale/nb/fusiondirectory.po b/personal/locale/nb/fusiondirectory.po
index 1903c2981aac1434cca701231d73a707e4acbc3a..7de41336d8bc5547f8fa1fe3029e65d91dc055b7 100644
--- a/personal/locale/nb/fusiondirectory.po
+++ b/personal/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/personal/locale/nl/fusiondirectory.po b/personal/locale/nl/fusiondirectory.po
index e6a2d4124a5adcc3c72374824b527dd6b6a07499..3cb333cc210f8b33c57d1c637455b59c35954f4d 100644
--- a/personal/locale/nl/fusiondirectory.po
+++ b/personal/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/personal/locale/pl/fusiondirectory.po b/personal/locale/pl/fusiondirectory.po
index 831511df0973531ea237ebf00e57897dda4f7c6b..796b6c49157d7fe1d1fbdd14a3d779789ddedde1 100644
--- a/personal/locale/pl/fusiondirectory.po
+++ b/personal/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/personal/locale/pt/fusiondirectory.po b/personal/locale/pt/fusiondirectory.po
index 086897dbaf95c09df59bcf988818b7421dcb8e92..bdc23d8fc7761eea51fb4a98d3d1f34d12c93fa3 100644
--- a/personal/locale/pt/fusiondirectory.po
+++ b/personal/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/personal/locale/pt_BR/fusiondirectory.po b/personal/locale/pt_BR/fusiondirectory.po
index 9594299d0673ad7f23547bdf6c420b0457305910..bbad0f7f9f6e2f8dfc1476cc4a5dcfb5b3bc6488 100644
--- a/personal/locale/pt_BR/fusiondirectory.po
+++ b/personal/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/personal/locale/ru/fusiondirectory.po b/personal/locale/ru/fusiondirectory.po
index 90f08199f6b370d640ae03d2086a9dcb5f1de1ba..e98490adcf75c161a5eace731e304d7f17f8fc99 100644
--- a/personal/locale/ru/fusiondirectory.po
+++ b/personal/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/personal/locale/ru@petr1708/fusiondirectory.po b/personal/locale/ru@petr1708/fusiondirectory.po
index 90951c439e09b3c8eefbf09097613c56d98882af..3c53a60cfcccad472ccc91d1fbbd084be90d80d3 100644
--- a/personal/locale/ru@petr1708/fusiondirectory.po
+++ b/personal/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/personal/locale/sv/fusiondirectory.po b/personal/locale/sv/fusiondirectory.po
index c881da40653ed317defd239c382adb0f271bc224..08f0f875d2ecc9b778a465c3f21d80f82e7ca817 100644
--- a/personal/locale/sv/fusiondirectory.po
+++ b/personal/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/personal/locale/tr_TR/fusiondirectory.po b/personal/locale/tr_TR/fusiondirectory.po
index 2b9cd1d1bab47bf7ed94a9a2f853174043c54033..df9a5bb414a974101d30cb8e0e52c5c773757580 100644
--- a/personal/locale/tr_TR/fusiondirectory.po
+++ b/personal/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/personal/locale/ug/fusiondirectory.po b/personal/locale/ug/fusiondirectory.po
index 5b5b0c7fb43f4c3ecf80388da9547cb610f83246..4d05b39b5809d07cd08a819580574e3fe8dacae6 100644
--- a/personal/locale/ug/fusiondirectory.po
+++ b/personal/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/personal/locale/vi_VN/fusiondirectory.po b/personal/locale/vi_VN/fusiondirectory.po
index d5cbcb2b927116a148c368fd30af27f8f3357599..4a5387a139f583c1cffef87a74c87622f1058866 100644
--- a/personal/locale/vi_VN/fusiondirectory.po
+++ b/personal/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/personal/locale/zh/fusiondirectory.po b/personal/locale/zh/fusiondirectory.po
index a75c5656688bf796e6e2978c50654c1417eaa7b6..97e77b26a3df99b5e586a6d3ceefa0295b9d9663 100644
--- a/personal/locale/zh/fusiondirectory.po
+++ b/personal/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/personal/locale/zh_TW/fusiondirectory.po b/personal/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..b29ac629bf11981b7ae8ff8fe0cb4115fd6ab75c
--- /dev/null
+++ b/personal/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,171 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: config/personal/class_personalConfig.inc:28
+msgid "Personal configuration"
+msgstr ""
+
+#: config/personal/class_personalConfig.inc:29
+msgid "FusionDirectory personal plugin configuration"
+msgstr ""
+
+#: config/personal/class_personalConfig.inc:42
+#: personal/personal/class_personalInfo.inc:85
+msgid "Personal"
+msgstr ""
+
+#: config/personal/class_personalConfig.inc:45
+msgid "Allow use of private email for password recovery"
+msgstr ""
+
+#: config/personal/class_personalConfig.inc:45
+msgid "Allow users to use their private email address for password recovery"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:30
+msgid "Site"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:30
+msgid "Website the account is on"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:36
+msgid "Id"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:36
+msgid "Id of this user on this website"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:86
+msgid "Personal information"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:101
+msgid "Personal info"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:104
+msgid "Personal title"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:104
+msgid "Personal title - Examples of personal titles are \"Ms\", \"Dr\", \"Prof\" and \"Rev\""
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:109
+msgid "Nickname"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:109
+msgid "Nicknames for this user"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:114
+msgid "Badge Number"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:114
+msgid "Company badge number"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:118
+msgid "Date of birth"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:123
+msgid "Sex"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:123
+msgid "Gender"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:128
+msgid "Country"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:132
+msgid "Start date"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:132
+msgid "Date this user joined the company"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:137
+msgid "End date"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:137
+msgid "Date this user is supposed to leave the company"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Photo Visible"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:142
+msgid "Should the photo of the user be visible on external tools"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:148
+msgid "Contact"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:152
+msgid "Social account"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:152
+msgid "Social accounts of this user"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:159
+msgid "Private email"
+msgstr ""
+
+#: personal/personal/class_personalInfo.inc:159
+msgid "Private email addresses of this user"
+msgstr ""
+
+#: personal/personal/class_socialHandlers.inc:68
+msgid "Facebook"
+msgstr ""
+
+#: personal/personal/class_socialHandlers.inc:78
+msgid "Twitter"
+msgstr ""
+
+#: personal/personal/class_socialHandlers.inc:98
+msgid "Google+"
+msgstr ""
+
+#: personal/personal/class_socialHandlers.inc:118
+msgid "Diaspora*"
+msgstr ""
+
+#: personal/personal/class_socialHandlers.inc:131
+msgid "Diaspora accounts must look like user@pod"
+msgstr ""
+
+#: personal/personal/class_socialHandlers.inc:141
+msgid "LinkedIn"
+msgstr ""
diff --git a/posix/locale/af_ZA/fusiondirectory.po b/posix/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..4e798c8866f0ac9300fb98ad581ca1f825f815db
--- /dev/null
+++ b/posix/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,478 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: 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
+#: admin/groups/posix/class_posixGroup.inc:150
+#: personal/posix/class_posixAccount.inc:425
+msgid "GID"
+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:91
+#: personal/posix/class_posixAccount.inc:203
+msgid "System trust"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:95
+#: personal/posix/class_posixAccount.inc:207
+msgid "Trust mode"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:95
+#: personal/posix/class_posixAccount.inc:207
+msgid "Type of authorization for those hosts"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:99
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
+msgid "disabled"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:99
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
+msgid "full access"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:99
+#: personal/posix/class_posixAccount.inc:211
+msgid "allow access to these hosts"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+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 "POSIX groups RDN"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:51
+msgid "Group/user min id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Next id hook"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:57
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:61
+msgid "Base number for user id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Where to start looking for a new free user id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:67
+msgid "Base number for group id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Where to start looking for a new free group id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:73
+msgid "Id allocation method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:73
+msgid "Method to allocate user/group ids"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:76
+msgid "Traditional"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:76
+msgid "Samba unix id pool"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool user id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Minimum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:94
+msgid "Pool group id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:94
+msgid "Maximum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:101
+msgid "Shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:105
+msgid "Available shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:105
+msgid "Available POSIX shells for FD users."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:112
+msgid "Default shell"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:112
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
+msgid "Unix"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:89
+msgid "Edit users POSIX settings"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:121
+msgid "Home directory"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:121
+msgid "The path to the home directory of this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "Shell"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "Which shell should be used when this user log in"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:128
+msgid "unconfigured"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:132
+msgid "Primary group"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:132
+msgid "Primary group for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:136
+msgid "Status"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:136
+msgid "Status of this user unix account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:140
+msgid "Force user/group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:140
+msgid "Force user id and group id values for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:144
+msgid "User id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:144
+msgid "User id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:149
+msgid "Group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:149
+msgid "Group id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
+msgid "Group membership"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:163
+msgid "Account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:167
+msgid "User must change password on first login"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:167
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:171
+msgid "Minimum delay between password changes (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:171
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:176
+msgid "Delay before forcing password change (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:176
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:181
+msgid "Password expiration date"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:181
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:186
+msgid "Delay of inactivity before disabling user (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:186
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:191
+msgid "Delay for user warning before password expiry (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:191
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:214
+msgid "Only allow this user to connect to this list of hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:292
+msgid "automatic"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:353
+msgid "expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:355
+msgid "grace time active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
+msgid "active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:358
+msgid "password expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:360
+msgid "password not changeable"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:422
+msgid "UID"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:537
+#, php-format
+msgid "Group of user %s"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
+msgid "Warning"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:783
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
+msgid "Error"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+msgid "Cannot allocate a free ID:"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:832
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:864
+msgid "LDAP error"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:872
+msgid "sambaUnixIdPool is not unique!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+msgid "no ID available!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:904
+msgid "maximum tries exceeded!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:966
+msgid "Cannot allocate a free ID!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:998
+msgid "\"nextIdHook\" is not available. Using default base!"
+msgstr ""
diff --git a/posix/locale/ar/fusiondirectory.po b/posix/locale/ar/fusiondirectory.po
index ef86a388e52d25ae9bd14171b2f62f7324125b05..159ce67c8f249d0bbb38a49ab589b859e400743a 100644
--- a/posix/locale/ar/fusiondirectory.po
+++ b/posix/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/posix/locale/ca/fusiondirectory.po b/posix/locale/ca/fusiondirectory.po
index 39b8ead38d68d938e0acf21b32179df93f1d8b1b..264d9a9fa762891803501e354581cc62435f4567 100644
--- a/posix/locale/ca/fusiondirectory.po
+++ b/posix/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/posix/locale/cs_CZ/fusiondirectory.po b/posix/locale/cs_CZ/fusiondirectory.po
index 52e451a11642ce331bbff5ab24a2eee1587d1228..20bbce97bd54ee92d0e19f5c3adbf02998206f57 100644
--- a/posix/locale/cs_CZ/fusiondirectory.po
+++ b/posix/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/groups/posix/class_posixGroup.inc:34
 msgid "Group"
diff --git a/posix/locale/de/fusiondirectory.po b/posix/locale/de/fusiondirectory.po
index 412099bd20bb428ae773426e953b59fe49550530..da34f7217c13a25b482b23aa461eeaddec2f7117 100644
--- a/posix/locale/de/fusiondirectory.po
+++ b/posix/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/posix/locale/el_GR/fusiondirectory.po b/posix/locale/el_GR/fusiondirectory.po
index 399241088ff97170f19a53d4e6b3facc56587850..273fc0b01fc2b47ad07244f4a257de0f9797008f 100644
--- a/posix/locale/el_GR/fusiondirectory.po
+++ b/posix/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/posix/locale/es/fusiondirectory.po b/posix/locale/es/fusiondirectory.po
index 29f67fcedc780ed850639c0ebf0ca55d7e25f0ee..b90fd4df72dcbb957ad07db48cf0bcd594c32a27 100644
--- a/posix/locale/es/fusiondirectory.po
+++ b/posix/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/posix/locale/es_CO/fusiondirectory.po b/posix/locale/es_CO/fusiondirectory.po
index d622d96376e4ec2b4210b7552fda64fb2476e531..9a93b6dce015549f36f880b377364dee99adab5d 100644
--- a/posix/locale/es_CO/fusiondirectory.po
+++ b/posix/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/posix/locale/es_VE/fusiondirectory.po b/posix/locale/es_VE/fusiondirectory.po
index 7286845a9e05773328688abe6608131a42893940..83dd243595b2edb725ff07e7d112201612c865e0 100644
--- a/posix/locale/es_VE/fusiondirectory.po
+++ b/posix/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/posix/locale/fa_IR/fusiondirectory.po b/posix/locale/fa_IR/fusiondirectory.po
index 0441ae889b43fcd33f966455195520d5d6c1caea..adb3359ce78e736df8a09fb4beccc81ef53c7b29 100644
--- a/posix/locale/fa_IR/fusiondirectory.po
+++ b/posix/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa_IR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/groups/posix/class_posixGroup.inc:34
 msgid "Group"
diff --git a/posix/locale/fi_FI/fusiondirectory.po b/posix/locale/fi_FI/fusiondirectory.po
index 500921d43e40ef2d3397bc0fe2ce90a75c6b3880..6a84c7daaabdb9839b7fe695591c2c9770a6cfd1 100644
--- a/posix/locale/fi_FI/fusiondirectory.po
+++ b/posix/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/posix/locale/fr/fusiondirectory.po b/posix/locale/fr/fusiondirectory.po
index 1ad3eaa3973b042ebe45e5d7428cffa7d581c3e5..211a82b0c0f74dd633d8fa5caf218f0a218bc148 100644
--- a/posix/locale/fr/fusiondirectory.po
+++ b/posix/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Côme Chilliet, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/posix/locale/hu_HU/fusiondirectory.po b/posix/locale/hu_HU/fusiondirectory.po
index ff6332a9d4c86afab20cf309c7fe815ef50b6736..713b54816f02d722c70167b82cf2f78d646bf9b4 100644
--- a/posix/locale/hu_HU/fusiondirectory.po
+++ b/posix/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/posix/locale/id/fusiondirectory.po b/posix/locale/id/fusiondirectory.po
index de73664920abc7ec52ef31f7073424f3549a5508..c4ba193fd28f42e1c4870169ac1a6327787990f5 100644
--- a/posix/locale/id/fusiondirectory.po
+++ b/posix/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/posix/locale/it_IT/fusiondirectory.po b/posix/locale/it_IT/fusiondirectory.po
index 2e94531a6a98938a48a912eaf8be3d7baf78aa81..f0407fd5e55fbab030ad1bb99b6b02e1bce49fca 100644
--- a/posix/locale/it_IT/fusiondirectory.po
+++ b/posix/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/posix/locale/ja/fusiondirectory.po b/posix/locale/ja/fusiondirectory.po
index a4f71652a023876cb0bda79913e9ad4ef8a5fb28..de25f279572d692c7ebc40ec496185e7af5bb7e3 100644
--- a/posix/locale/ja/fusiondirectory.po
+++ b/posix/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/posix/locale/ko/fusiondirectory.po b/posix/locale/ko/fusiondirectory.po
index c71f4da47202b9eacc0643937b49c52e72b4ffef..9a33e93bca5f622794232cb50532bf76b776df9b 100644
--- a/posix/locale/ko/fusiondirectory.po
+++ b/posix/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/posix/locale/lv/fusiondirectory.po b/posix/locale/lv/fusiondirectory.po
index 8b02b9db0e9b5a97779358a6e03f93500716d58c..d806026a9c414011c238935c77b3d798a26a1874 100644
--- a/posix/locale/lv/fusiondirectory.po
+++ b/posix/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/posix/locale/nb/fusiondirectory.po b/posix/locale/nb/fusiondirectory.po
index c0af6c031d301b8f6e73cde3bb6b98067c17895f..04bfebdd12a2f4a81170315e6c95b6b5951e8cbf 100644
--- a/posix/locale/nb/fusiondirectory.po
+++ b/posix/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/posix/locale/nl/fusiondirectory.po b/posix/locale/nl/fusiondirectory.po
index 2d2bc29b6001d6d6b92a59f67c4f76c06dbfe42e..9bb66d5ed990bcb647820381586aca3eb15b8587 100644
--- a/posix/locale/nl/fusiondirectory.po
+++ b/posix/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/posix/locale/pl/fusiondirectory.po b/posix/locale/pl/fusiondirectory.po
index a7b4cb4894194340bb9b78a5d2bd320b740503b5..3d8c1084c6b72765122bcb5ac1f00ea572085742 100644
--- a/posix/locale/pl/fusiondirectory.po
+++ b/posix/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/posix/locale/pt/fusiondirectory.po b/posix/locale/pt/fusiondirectory.po
index e3f8c76450371074576fc2833ed62922fff82268..34eda8e19c77df0d3f65bf9f7f0f0bd775ce3870 100644
--- a/posix/locale/pt/fusiondirectory.po
+++ b/posix/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/posix/locale/pt_BR/fusiondirectory.po b/posix/locale/pt_BR/fusiondirectory.po
index 19c4a472837465fd8b2d0b629c1550746b5d552d..3a12e7cfe699a6a70f7aef6e6a4a84fa3fdbedc6 100644
--- a/posix/locale/pt_BR/fusiondirectory.po
+++ b/posix/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/posix/locale/ru/fusiondirectory.po b/posix/locale/ru/fusiondirectory.po
index 69a70122d17796d1879b7c678f01ec33ac63a4aa..ffc64ddcfa3bdc6d104dd1769062381535df7964 100644
--- a/posix/locale/ru/fusiondirectory.po
+++ b/posix/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/posix/locale/ru@petr1708/fusiondirectory.po b/posix/locale/ru@petr1708/fusiondirectory.po
index 9626d7306ae48e4b77fc778cc926630e9b28e8c9..a153ef5a04822a54e847cc2187428d49b5174cde 100644
--- a/posix/locale/ru@petr1708/fusiondirectory.po
+++ b/posix/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/posix/locale/sv/fusiondirectory.po b/posix/locale/sv/fusiondirectory.po
index 395c331a8a8f5553e5b6b81d03cae159cd2d8c40..bacc0562dcca6166adac92c551a9af9eda653fb0 100644
--- a/posix/locale/sv/fusiondirectory.po
+++ b/posix/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/posix/locale/tr_TR/fusiondirectory.po b/posix/locale/tr_TR/fusiondirectory.po
index 30fda86754ef7cd6a82e50ff74da09e74bf58146..dfc53510a6e3f0d1a7c8f8376e69aac41a6ba5a8 100644
--- a/posix/locale/tr_TR/fusiondirectory.po
+++ b/posix/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/posix/locale/ug/fusiondirectory.po b/posix/locale/ug/fusiondirectory.po
index 56cc4c7f952df30a1907f4d4ac3b24f0dc8c9cb0..9edec90ad6e4a30cff410b8e4c11658d565810e1 100644
--- a/posix/locale/ug/fusiondirectory.po
+++ b/posix/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/posix/locale/vi_VN/fusiondirectory.po b/posix/locale/vi_VN/fusiondirectory.po
index f34866bae54596dda8419de83bd0820689b1a1aa..16299aea5633effb57422cd68b5b93a54d0c16b8 100644
--- a/posix/locale/vi_VN/fusiondirectory.po
+++ b/posix/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/posix/locale/zh/fusiondirectory.po b/posix/locale/zh/fusiondirectory.po
index fb369e5b36ba5b328713fd1f99e1aa7b44bc6ad6..032c0dae8aec7e638487b619be688ed75d5c38fa 100644
--- a/posix/locale/zh/fusiondirectory.po
+++ b/posix/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/posix/locale/zh_TW/fusiondirectory.po b/posix/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..3a721686caac12967584c4cf1a9357acc13f55a0
--- /dev/null
+++ b/posix/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,478 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: 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
+#: admin/groups/posix/class_posixGroup.inc:150
+#: personal/posix/class_posixAccount.inc:425
+msgid "GID"
+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:91
+#: personal/posix/class_posixAccount.inc:203
+msgid "System trust"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:95
+#: personal/posix/class_posixAccount.inc:207
+msgid "Trust mode"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:95
+#: personal/posix/class_posixAccount.inc:207
+msgid "Type of authorization for those hosts"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:99
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
+msgid "disabled"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:99
+#: personal/posix/class_posixAccount.inc:211
+#: personal/posix/class_posixAccount.inc:233
+msgid "full access"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:99
+#: personal/posix/class_posixAccount.inc:211
+msgid "allow access to these hosts"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+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 "POSIX groups RDN"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "The branch where POSIX groups are stored."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:51
+msgid "Group/user min id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Next id hook"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:57
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:61
+msgid "Base number for user id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Where to start looking for a new free user id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:67
+msgid "Base number for group id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Where to start looking for a new free group id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:73
+msgid "Id allocation method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:73
+msgid "Method to allocate user/group ids"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:76
+msgid "Traditional"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:76
+msgid "Samba unix id pool"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool user id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Minimum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:94
+msgid "Pool group id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:94
+msgid "Maximum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:101
+msgid "Shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:105
+msgid "Available shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:105
+msgid "Available POSIX shells for FD users."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:112
+msgid "Default shell"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:112
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:88
+#: personal/posix/class_posixAccount.inc:117
+msgid "Unix"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:89
+msgid "Edit users POSIX settings"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:121
+msgid "Home directory"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:121
+msgid "The path to the home directory of this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "Shell"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "Which shell should be used when this user log in"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:128
+msgid "unconfigured"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:132
+msgid "Primary group"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:132
+msgid "Primary group for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:136
+msgid "Status"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:136
+msgid "Status of this user unix account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:140
+msgid "Force user/group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:140
+msgid "Force user id and group id values for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:144
+msgid "User id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:144
+msgid "User id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:149
+msgid "Group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:149
+msgid "Group id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:156
+#: personal/posix/class_posixAccount.inc:159
+msgid "Group membership"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:163
+msgid "Account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:167
+msgid "User must change password on first login"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:167
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:171
+msgid "Minimum delay between password changes (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:171
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:176
+msgid "Delay before forcing password change (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:176
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:181
+msgid "Password expiration date"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:181
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:186
+msgid "Delay of inactivity before disabling user (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:186
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:191
+msgid "Delay for user warning before password expiry (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:191
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:214
+msgid "Only allow this user to connect to this list of hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:292
+msgid "automatic"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:353
+msgid "expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:355
+msgid "grace time active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:358
+#: personal/posix/class_posixAccount.inc:360
+#: personal/posix/class_posixAccount.inc:362
+msgid "active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:358
+msgid "password expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:360
+msgid "password not changeable"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:422
+msgid "UID"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:537
+#, php-format
+msgid "Group of user %s"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:783
+#: personal/posix/class_posixAccount.inc:804
+#: personal/posix/class_posixAccount.inc:998
+msgid "Warning"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:783
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+#: personal/posix/class_posixAccount.inc:966
+msgid "Error"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:832
+#: personal/posix/class_posixAccount.inc:872
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+#: personal/posix/class_posixAccount.inc:895
+#: personal/posix/class_posixAccount.inc:904
+msgid "Cannot allocate a free ID:"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:832
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:864
+msgid "LDAP error"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:872
+msgid "sambaUnixIdPool is not unique!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:884
+#: personal/posix/class_posixAccount.inc:888
+msgid "no ID available!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:904
+msgid "maximum tries exceeded!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:966
+msgid "Cannot allocate a free ID!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:998
+msgid "\"nextIdHook\" is not available. Using default base!"
+msgstr ""
diff --git a/postfix/locale/af_ZA/fusiondirectory.po b/postfix/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..ac380902e79f9e560c8d0cbfffaeb6d5c916e35a
--- /dev/null
+++ b/postfix/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,111 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:29
+#: admin/systems/services/postfix/class_servicePostfix.inc:30
+msgid "Postfix (SMTP)"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:30
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:44
+msgid "Information"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:47
+msgid "Hostname"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:47
+msgid "The host name."
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:52
+msgid "Domain"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:52
+msgid "The domain."
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:57
+msgid "Max mail header size (KB)"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:57
+msgid "This value specifies the maximal header size."
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:62
+msgid "Max mailbox size (KB)"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:62
+msgid "Defines the maximal size of mail box."
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:67
+msgid "Max message size (KB)"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:67
+msgid "Specify the maximal size of a message."
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:74
+msgid "Domains and routing"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:78
+msgid "Domains to accept mail for"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:78
+msgid "Postfix networks"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:83
+msgid "Transport table"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:88
+msgid "Transport rule"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:102
+msgid "Restrictions"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:106
+msgid "Restrictions for sender"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:115
+msgid "For sender"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:120
+msgid "Restrictions for recipient"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:129
+msgid "For recipient"
+msgstr ""
diff --git a/postfix/locale/ar/fusiondirectory.po b/postfix/locale/ar/fusiondirectory.po
index aa4a53844a94a2e3768fee1452e1f06b12128c06..543ba22cab0f4ee8d2b3d0e406adb43751d05b1e 100644
--- a/postfix/locale/ar/fusiondirectory.po
+++ b/postfix/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/postfix/locale/ca/fusiondirectory.po b/postfix/locale/ca/fusiondirectory.po
index 574a70a97ae547d26e15cd59c22455d5a8a7835f..824315fa03d054c141228eeb26f8ec8ea7bc8b1d 100644
--- a/postfix/locale/ca/fusiondirectory.po
+++ b/postfix/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/postfix/locale/cs_CZ/fusiondirectory.po b/postfix/locale/cs_CZ/fusiondirectory.po
index 9e091fc01296207c53ada37c914eb38492b320be..52f0e32e12b04bfd0d1d19e844127021356a8b09 100644
--- a/postfix/locale/cs_CZ/fusiondirectory.po
+++ b/postfix/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:29
 #: admin/systems/services/postfix/class_servicePostfix.inc:30
diff --git a/postfix/locale/de/fusiondirectory.po b/postfix/locale/de/fusiondirectory.po
index 41aadb84cd615947267dab3b31825928e1a3a099..8c823c5c4fe44d1e4578d27eaf2d3b82dd8e500f 100644
--- a/postfix/locale/de/fusiondirectory.po
+++ b/postfix/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/postfix/locale/el_GR/fusiondirectory.po b/postfix/locale/el_GR/fusiondirectory.po
index 8af458c33de3c121c55a7d531fcf9d4c40e80a2d..4e88cfdee82f5f2d00efc63b1ae6ad881961722e 100644
--- a/postfix/locale/el_GR/fusiondirectory.po
+++ b/postfix/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/postfix/locale/es/fusiondirectory.po b/postfix/locale/es/fusiondirectory.po
index c7df31ec5f894c7e3221ab699e42a802c108d145..1df3b849693d2e932882b21553f4bdc6241627e6 100644
--- a/postfix/locale/es/fusiondirectory.po
+++ b/postfix/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/postfix/locale/es_CO/fusiondirectory.po b/postfix/locale/es_CO/fusiondirectory.po
index de964d60f6027c37ca7d23f4f3ebe2d45df75ef0..28702aa71a3082bfefb72f0a1fdfa0345cb256f3 100644
--- a/postfix/locale/es_CO/fusiondirectory.po
+++ b/postfix/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/postfix/locale/es_VE/fusiondirectory.po b/postfix/locale/es_VE/fusiondirectory.po
index b56a04357872c2fcf0e3309c0d1ac84ba2f3f510..bc345a2b0e1551120834b29435e75acf38968812 100644
--- a/postfix/locale/es_VE/fusiondirectory.po
+++ b/postfix/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/postfix/locale/fa_IR/fusiondirectory.po b/postfix/locale/fa_IR/fusiondirectory.po
index 77abf4da174be5598d211a663defd6a40b6c32de..dfcfe642d6949cf379ab18f4a3746f119fa38e2c 100644
--- a/postfix/locale/fa_IR/fusiondirectory.po
+++ b/postfix/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:29
 #: admin/systems/services/postfix/class_servicePostfix.inc:30
diff --git a/postfix/locale/fi_FI/fusiondirectory.po b/postfix/locale/fi_FI/fusiondirectory.po
index 9913d79d03c7af5397ab6435d2d977e1da44955d..b4ce3d2e2d8ff75ac40399e9d51947783998fa81 100644
--- a/postfix/locale/fi_FI/fusiondirectory.po
+++ b/postfix/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/postfix/locale/fr/fusiondirectory.po b/postfix/locale/fr/fusiondirectory.po
index c04eb39332117f15eca3b4fb8a9b362074721327..700e199b45f005859837e46764ebbfbcd9a688ba 100644
--- a/postfix/locale/fr/fusiondirectory.po
+++ b/postfix/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/postfix/locale/hu_HU/fusiondirectory.po b/postfix/locale/hu_HU/fusiondirectory.po
index 6dae94305b4650874be1b67880c354c727758aa6..ab83ff57729f10844a7b0fa9c3db70ee35731094 100644
--- a/postfix/locale/hu_HU/fusiondirectory.po
+++ b/postfix/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/postfix/locale/id/fusiondirectory.po b/postfix/locale/id/fusiondirectory.po
index 23236ab95dcbd5a91b239142ffd0666044b85336..f00a482ca5af48fa35c37f69d62a5fd13aed1079 100644
--- a/postfix/locale/id/fusiondirectory.po
+++ b/postfix/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/postfix/locale/it_IT/fusiondirectory.po b/postfix/locale/it_IT/fusiondirectory.po
index a4016c7e69b38fc06cdae3a39ae44ffaa90513f4..b242cab0338e4b769b318e4a6e5529a2d21a8952 100644
--- a/postfix/locale/it_IT/fusiondirectory.po
+++ b/postfix/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/postfix/locale/ja/fusiondirectory.po b/postfix/locale/ja/fusiondirectory.po
index 7daf67e279bafb605d38bddcdf49c1a5b4ed18f1..7c3ee008045205c758b45c55bcb065564e129d81 100644
--- a/postfix/locale/ja/fusiondirectory.po
+++ b/postfix/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/postfix/locale/ko/fusiondirectory.po b/postfix/locale/ko/fusiondirectory.po
index 5ca3f4abeaa91d58ff7ff5e422357e9b47d03359..45f19792dffb66915b287ea674f385b0e294fa7b 100644
--- a/postfix/locale/ko/fusiondirectory.po
+++ b/postfix/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/postfix/locale/lv/fusiondirectory.po b/postfix/locale/lv/fusiondirectory.po
index 13ce12e452a4cc74ab1c809b272fd6860f9dfb31..b1d809a6d396d8ff94b43b6d047ae967bbdcc0d6 100644
--- a/postfix/locale/lv/fusiondirectory.po
+++ b/postfix/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/postfix/locale/nb/fusiondirectory.po b/postfix/locale/nb/fusiondirectory.po
index 75d943ca0bb4c9a9500f505d04203af7ed14ca45..92cb14d221c989d764b8ec97c34f25e996e49edd 100644
--- a/postfix/locale/nb/fusiondirectory.po
+++ b/postfix/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/postfix/locale/nl/fusiondirectory.po b/postfix/locale/nl/fusiondirectory.po
index abfae78ea04e5db969c4740db5c198b9ef3455fa..328e0fc3fdad28b7e516439ece2fc3d3c84849c4 100644
--- a/postfix/locale/nl/fusiondirectory.po
+++ b/postfix/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/postfix/locale/pl/fusiondirectory.po b/postfix/locale/pl/fusiondirectory.po
index b0638e66d0bcae158e78b16e3a114225341df2f8..3adabd3c4389ee254b2025e9ccca0bce0fad7756 100644
--- a/postfix/locale/pl/fusiondirectory.po
+++ b/postfix/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/postfix/locale/pt/fusiondirectory.po b/postfix/locale/pt/fusiondirectory.po
index a3a017a427ce9f200771e9d775ee00e69742d636..b9e11ef8c0f282418d956a42f53b53340dc6491b 100644
--- a/postfix/locale/pt/fusiondirectory.po
+++ b/postfix/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/postfix/locale/pt_BR/fusiondirectory.po b/postfix/locale/pt_BR/fusiondirectory.po
index 49f130376e933fe466fe25afc1772085afdd5a0c..439afdcea15911c9d448038704077b6a7bcbac4e 100644
--- a/postfix/locale/pt_BR/fusiondirectory.po
+++ b/postfix/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/postfix/locale/ru/fusiondirectory.po b/postfix/locale/ru/fusiondirectory.po
index 6478721b5ab49f915de1650b3f5519366cdd6b8e..2691752b12ac6a613e3f30f85e0f535cbaf83d92 100644
--- a/postfix/locale/ru/fusiondirectory.po
+++ b/postfix/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/postfix/locale/ru@petr1708/fusiondirectory.po b/postfix/locale/ru@petr1708/fusiondirectory.po
index 2e6d428d4c541162de4c35fa1c8e5bf44e06cb75..d591ef3190627c1da13472be49b1d332013f8522 100644
--- a/postfix/locale/ru@petr1708/fusiondirectory.po
+++ b/postfix/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/postfix/locale/sv/fusiondirectory.po b/postfix/locale/sv/fusiondirectory.po
index 9be0ef82cafd88b87153a889dd28f304a5aa4179..461cb1440e8ea13e4d867a2ce6457b8b9a8793fa 100644
--- a/postfix/locale/sv/fusiondirectory.po
+++ b/postfix/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/postfix/locale/tr_TR/fusiondirectory.po b/postfix/locale/tr_TR/fusiondirectory.po
index e163676cdfaaeedd4480c76db1bdf0416292ffc6..104595fc042cd7727378315e9a211842811380af 100644
--- a/postfix/locale/tr_TR/fusiondirectory.po
+++ b/postfix/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/postfix/locale/ug/fusiondirectory.po b/postfix/locale/ug/fusiondirectory.po
index bb97b2202e5a08e308895597a84c0fb294467379..1cd99b493fd27804f90446d425dcf80619d6b496 100644
--- a/postfix/locale/ug/fusiondirectory.po
+++ b/postfix/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/postfix/locale/vi_VN/fusiondirectory.po b/postfix/locale/vi_VN/fusiondirectory.po
index 3077c3c2f8d972709ac5d44f303ae73599817d8c..e7960d1ddb4ae62b7ecd81b4640c6e67f090703d 100644
--- a/postfix/locale/vi_VN/fusiondirectory.po
+++ b/postfix/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/postfix/locale/zh/fusiondirectory.po b/postfix/locale/zh/fusiondirectory.po
index 512a384d439e0b2c34e94485648f21a764ab8611..e7c735bfb0c95816026a68793d30984d9bb4bd05 100644
--- a/postfix/locale/zh/fusiondirectory.po
+++ b/postfix/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/postfix/locale/zh_TW/fusiondirectory.po b/postfix/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..32faa7c28da55508d74094f40bce3199819680e3
--- /dev/null
+++ b/postfix/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,111 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:29
+#: admin/systems/services/postfix/class_servicePostfix.inc:30
+msgid "Postfix (SMTP)"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:30
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:44
+msgid "Information"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:47
+msgid "Hostname"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:47
+msgid "The host name."
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:52
+msgid "Domain"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:52
+msgid "The domain."
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:57
+msgid "Max mail header size (KB)"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:57
+msgid "This value specifies the maximal header size."
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:62
+msgid "Max mailbox size (KB)"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:62
+msgid "Defines the maximal size of mail box."
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:67
+msgid "Max message size (KB)"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:67
+msgid "Specify the maximal size of a message."
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:74
+msgid "Domains and routing"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:78
+msgid "Domains to accept mail for"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:78
+msgid "Postfix networks"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:83
+msgid "Transport table"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:88
+msgid "Transport rule"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:102
+msgid "Restrictions"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:106
+msgid "Restrictions for sender"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:115
+msgid "For sender"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:120
+msgid "Restrictions for recipient"
+msgstr ""
+
+#: admin/systems/services/postfix/class_servicePostfix.inc:129
+msgid "For recipient"
+msgstr ""
diff --git a/ppolicy/locale/af_ZA/fusiondirectory.po b/ppolicy/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..49cbd5b895731c700e52175b1597ec7e4ff45e78
--- /dev/null
+++ b/ppolicy/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,392 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/ppolicy/class_ppolicyManagement.inc:29
+msgid "Password policies"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicyManagement.inc:30
+msgid "Password policies management"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+msgid "Password policy"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:33
+msgid "Password policy for ppolicy overlay"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:51
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Policy"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:56
+msgid "Policy name"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:60
+msgid "Description"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:60
+msgid "A short description of this policy"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:64
+msgid "Minimum length"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:64
+msgid ""
+"Minimum length of the user supplied password - passwords shorter than this "
+"value will be rejected"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:69
+msgid "Passwords in history"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:69
+msgid ""
+"Number of passwords that are maintained in a list of previously used "
+"passwords"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:74
+msgid "Minimum password age"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:74
+msgid "Minimum time between password changes"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:79
+msgid "Maximum password age"
+msgstr ""
+
+#: 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 ""
+
+#: admin/ppolicy/class_ppolicy.inc:84
+msgid "Expiry warning delay"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:84
+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 ""
+
+#: admin/ppolicy/class_ppolicy.inc:89
+msgid "Grace period"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:89
+msgid ""
+"Number of times a user is allowed to successfully bind using an expired "
+"password"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:94
+msgid "Allow user change"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:94
+msgid "Whether users are allowed to change their own passwords"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:99
+msgid "Safe modify"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:99
+msgid ""
+"Whether a user must send the current password during a password modification"
+" operation"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:104
+msgid "Check quality"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:104
+msgid "Decides what to do if the function in \"Check module\" is not available"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:107
+msgid "Disabled"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:107
+msgid "Ignore errors"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:107
+msgid "Reject on errors"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:110
+msgid "Check module"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:110
+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 ""
+
+#: admin/ppolicy/class_ppolicy.inc:116
+msgid "Lock out"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:120
+msgid "Activate lock out"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:120
+msgid ""
+"Whether to lock an account that had more consecutive failed bind attempts "
+"with invalid passwords than is defined by \"Maximum failures\""
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:125
+msgid "Lock out duration"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:125
+msgid ""
+"Time the account remains locked after an automatic lock out (0 means for "
+"ever)"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:130
+msgid "Maximum failures"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:130
+msgid ""
+"Number of consecutive password failures allowed before automatic lock out"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:135
+msgid "Failure count interval"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:135
+msgid ""
+"Time after which the count of consecutive password failures is reset even if"
+" no successful authentication has occurred"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:140
+msgid "Must change"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:140
+msgid ""
+"Whether the user must change their password after an account is reset by an "
+"administrator following an automatic lockout"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:40
+msgid "Expired accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:45
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+msgid "Login"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Name"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+#: addons/dashboard/class_dashBoardPPolicy.inc:66
+msgid "Phone number"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:61
+msgid "Expiration date"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Email"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
+msgid "Configuration error"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:87
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:140
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Reset locking / force change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Resets the lock status of this account and/or force a password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Force password change (resets locking)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Reset locking (same password)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:77
+msgid "Use the default"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr ""
+
+#: 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] ""
+
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
+msgid "There is no locked account"
+msgstr ""
+
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:11
+msgid "Manager concerned"
+msgstr ""
+
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:14
+msgid "uid"
+msgstr ""
+
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:17
+msgid "cn"
+msgstr ""
+
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:20
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:32
+msgid "telephoneNumber"
+msgstr ""
+
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:23
+msgid "pwdAccountLockedTime"
+msgstr ""
+
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:26
+msgid "manager"
+msgstr ""
+
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:29
+msgid "mail"
+msgstr ""
diff --git a/ppolicy/locale/ar/fusiondirectory.po b/ppolicy/locale/ar/fusiondirectory.po
index ac2c92615593ede132bcccd25a2fade142cca73e..b01df72235b1a61ca8b626d12c45b400d4c1c63f 100644
--- a/ppolicy/locale/ar/fusiondirectory.po
+++ b/ppolicy/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/ppolicy/locale/ca/fusiondirectory.po b/ppolicy/locale/ca/fusiondirectory.po
index d90028e21df9bfc6ceed901ef06145903fa1d40c..ee7b86eb3e008918d774ad74ae353416ae1e5d23 100644
--- a/ppolicy/locale/ca/fusiondirectory.po
+++ b/ppolicy/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/ppolicy/locale/cs_CZ/fusiondirectory.po b/ppolicy/locale/cs_CZ/fusiondirectory.po
index 265bd1628b5bdad87b79eb94413f04625c313d17..d0c797cbb7e662d401735d6285a8196af2b53c8b 100644
--- a/ppolicy/locale/cs_CZ/fusiondirectory.po
+++ b/ppolicy/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
@@ -384,6 +384,7 @@ msgid_plural "There are %1 locked accounts"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
+msgstr[3] ""
 
 #: 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 0dabf7612cecd6b154c74645195fbf3f0a5d8e83..f1bc69c3ea1d2a40ffd31ad88e7e4c45c957468c 100644
--- a/ppolicy/locale/de/fusiondirectory.po
+++ b/ppolicy/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ppolicy/locale/el_GR/fusiondirectory.po b/ppolicy/locale/el_GR/fusiondirectory.po
index 2fabd1ca2b517de2ee134531b81d1431cb502025..0a686958034a777eaecf661356570563fd64999e 100644
--- a/ppolicy/locale/el_GR/fusiondirectory.po
+++ b/ppolicy/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ppolicy/locale/es/fusiondirectory.po b/ppolicy/locale/es/fusiondirectory.po
index 88b10ca092a0a1557aa9f7e5748a130df85210de..c6c6afb12c55e09b23c9d9a8d1fcf6379beaf7e4 100644
--- a/ppolicy/locale/es/fusiondirectory.po
+++ b/ppolicy/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ppolicy/locale/es_CO/fusiondirectory.po b/ppolicy/locale/es_CO/fusiondirectory.po
index 80c16e5d747b53a5aabcea2bbf892d123fec621c..3a6f08817f2e7b1f9f46da5915f679da291da724 100644
--- a/ppolicy/locale/es_CO/fusiondirectory.po
+++ b/ppolicy/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ppolicy/locale/es_VE/fusiondirectory.po b/ppolicy/locale/es_VE/fusiondirectory.po
index 73369fcf6c8ef84335b03c2a18d4aaa015ad3ea6..ed888be7ee29293f1180874ff0396f797a98b56c 100644
--- a/ppolicy/locale/es_VE/fusiondirectory.po
+++ b/ppolicy/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ppolicy/locale/fa_IR/fusiondirectory.po b/ppolicy/locale/fa_IR/fusiondirectory.po
index f5631d293931f889e530d715cd878b00b5f0bdc7..39b652f083817e2cb796929306ca25f97da6a3b5 100644
--- a/ppolicy/locale/fa_IR/fusiondirectory.po
+++ b/ppolicy/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa_IR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
@@ -357,6 +357,7 @@ msgstr ""
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
 msgstr[0] ""
+msgstr[1] ""
 
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
 msgid "There is no locked account"
diff --git a/ppolicy/locale/fi_FI/fusiondirectory.po b/ppolicy/locale/fi_FI/fusiondirectory.po
index 36b618f6d51834a2e7201316ab3b267531fcf1e7..50145634b6d35995acf240144487e0d20664bb22 100644
--- a/ppolicy/locale/fi_FI/fusiondirectory.po
+++ b/ppolicy/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/ppolicy/locale/fr/fusiondirectory.po b/ppolicy/locale/fr/fusiondirectory.po
index a71f7c7b4e98304e037c595481518230da1b804b..2279617f37d520942648972df350e16634c98f1c 100644
--- a/ppolicy/locale/fr/fusiondirectory.po
+++ b/ppolicy/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/ppolicy/locale/hu_HU/fusiondirectory.po b/ppolicy/locale/hu_HU/fusiondirectory.po
index 5c67be662270b1b7495e323a4ad46beacbc72c9e..025153b96e114db144631d032f12283a50a26b54 100644
--- a/ppolicy/locale/hu_HU/fusiondirectory.po
+++ b/ppolicy/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/ppolicy/locale/id/fusiondirectory.po b/ppolicy/locale/id/fusiondirectory.po
index af60b4a8e823cb8bea554946783a0686f6967f76..40028f1ad17828f005c8c206e3f4d8388a6e2614 100644
--- a/ppolicy/locale/id/fusiondirectory.po
+++ b/ppolicy/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ppolicy/locale/it_IT/fusiondirectory.po b/ppolicy/locale/it_IT/fusiondirectory.po
index b1a7da649b38f373383d4e9cad0cbd27b7882aa3..d0d4909ee2778a97438e97b963c60082bf931a27 100644
--- a/ppolicy/locale/it_IT/fusiondirectory.po
+++ b/ppolicy/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/ppolicy/locale/ja/fusiondirectory.po b/ppolicy/locale/ja/fusiondirectory.po
index 8f5588eaa7b0676c53303911ac91f258bd3a78e4..cb41ba8d17fe932746e17d29923bc92b6579dc36 100644
--- a/ppolicy/locale/ja/fusiondirectory.po
+++ b/ppolicy/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ppolicy/locale/ko/fusiondirectory.po b/ppolicy/locale/ko/fusiondirectory.po
index 1e105ef545e2d79278af423c3e8e5fb69951d87f..ad5857e7ae52a8dc68b13758cae4d08f918f2a43 100644
--- a/ppolicy/locale/ko/fusiondirectory.po
+++ b/ppolicy/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/ppolicy/locale/lv/fusiondirectory.po b/ppolicy/locale/lv/fusiondirectory.po
index 5b60f6c3e4f294678430d19db073c50683e240af..1efd56bc291410b79456d146705db743304f265c 100644
--- a/ppolicy/locale/lv/fusiondirectory.po
+++ b/ppolicy/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/ppolicy/locale/nb/fusiondirectory.po b/ppolicy/locale/nb/fusiondirectory.po
index bde5a41620b903448d9e7a4b7172696fd50ea447..cdff9f5d81e0811230a6b5ba53548ef77ceff2c4 100644
--- a/ppolicy/locale/nb/fusiondirectory.po
+++ b/ppolicy/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/ppolicy/locale/nl/fusiondirectory.po b/ppolicy/locale/nl/fusiondirectory.po
index 800d488bf32aa8ab65d775bce5d275cd035d045b..428d925eaa25a0b08a9902c38c9160becd82bf3d 100644
--- a/ppolicy/locale/nl/fusiondirectory.po
+++ b/ppolicy/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Rombout de Neef <rombout.deneef@digipolis.be>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/ppolicy/locale/pl/fusiondirectory.po b/ppolicy/locale/pl/fusiondirectory.po
index d2309e6711aa56bcbf921d766173f1f2defae297..e3c9eddc839556e2191121bf0fc58797f60c052b 100644
--- a/ppolicy/locale/pl/fusiondirectory.po
+++ b/ppolicy/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ppolicy/locale/pt/fusiondirectory.po b/ppolicy/locale/pt/fusiondirectory.po
index 0f184ceeed939f8e4740e74745a3d09ed5251ad9..19e921b4e5d9a2a5d0ecb3638176fc475fafdfe0 100644
--- a/ppolicy/locale/pt/fusiondirectory.po
+++ b/ppolicy/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/ppolicy/locale/pt_BR/fusiondirectory.po b/ppolicy/locale/pt_BR/fusiondirectory.po
index 70d523ac0b61cdb17cc80333199ccc7b805650d9..cc4af92d04705482256e3df8b0951af5b1e888cd 100644
--- a/ppolicy/locale/pt_BR/fusiondirectory.po
+++ b/ppolicy/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ppolicy/locale/ru/fusiondirectory.po b/ppolicy/locale/ru/fusiondirectory.po
index f6d7473df873c6a085e0693462e7970578fcbb82..17592c1e49bf95463f9c6ce57fba28da2d5e19dd 100644
--- a/ppolicy/locale/ru/fusiondirectory.po
+++ b/ppolicy/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ppolicy/locale/ru@petr1708/fusiondirectory.po b/ppolicy/locale/ru@petr1708/fusiondirectory.po
index c4f3b0b0042221594a13932249da835574cef5ed..d9866365a196b0e128a3f00fc90ab0092a1ac428 100644
--- a/ppolicy/locale/ru@petr1708/fusiondirectory.po
+++ b/ppolicy/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ppolicy/locale/sv/fusiondirectory.po b/ppolicy/locale/sv/fusiondirectory.po
index d0c5860833af82e260ff8c0491b30e2bccf1b6a8..e6aeb433665cabf3c9da58d85ffe8bc8bdaae7b0 100644
--- a/ppolicy/locale/sv/fusiondirectory.po
+++ b/ppolicy/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ppolicy/locale/tr_TR/fusiondirectory.po b/ppolicy/locale/tr_TR/fusiondirectory.po
index a13e632a15fe15c6a645a25f56444043cf2182b6..f607a1be2a4b500d8e2a158bd319ccc69904f26d 100644
--- a/ppolicy/locale/tr_TR/fusiondirectory.po
+++ b/ppolicy/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ppolicy/locale/ug/fusiondirectory.po b/ppolicy/locale/ug/fusiondirectory.po
index e28bf3a6535699c1cf22c4aa88c2ca7b343a7df5..04c5adeb9a7390d751b07c9ec9300943ac57ab11 100644
--- a/ppolicy/locale/ug/fusiondirectory.po
+++ b/ppolicy/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ppolicy/locale/vi_VN/fusiondirectory.po b/ppolicy/locale/vi_VN/fusiondirectory.po
index 42b30eec77404ea27001755c727410ee7a18a33a..230699348ff3dcb7dbe50383c705768a61e7efa9 100644
--- a/ppolicy/locale/vi_VN/fusiondirectory.po
+++ b/ppolicy/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/ppolicy/locale/zh/fusiondirectory.po b/ppolicy/locale/zh/fusiondirectory.po
index 42ff4ae8d2a593113fb787410a165f19b0741e76..6b709963e70a592bc0cb15a2fc2d6b2642b9aef2 100644
--- a/ppolicy/locale/zh/fusiondirectory.po
+++ b/ppolicy/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ppolicy/locale/zh_TW/fusiondirectory.po b/ppolicy/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..7001d79f5f4a02d9de9a6f6b70feeefadaef3013
--- /dev/null
+++ b/ppolicy/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,391 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/ppolicy/class_ppolicyManagement.inc:29
+msgid "Password policies"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicyManagement.inc:30
+msgid "Password policies management"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
+#: personal/ppolicy/class_ppolicyAccount.inc:29
+#: personal/ppolicy/class_ppolicyAccount.inc:44
+msgid "Password policy"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:33
+msgid "Password policy for ppolicy overlay"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:51
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Policy"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:56
+msgid "Policy name"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:60
+msgid "Description"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:60
+msgid "A short description of this policy"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:64
+msgid "Minimum length"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:64
+msgid ""
+"Minimum length of the user supplied password - passwords shorter than this "
+"value will be rejected"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:69
+msgid "Passwords in history"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:69
+msgid ""
+"Number of passwords that are maintained in a list of previously used "
+"passwords"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:74
+msgid "Minimum password age"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:74
+msgid "Minimum time between password changes"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:79
+msgid "Maximum password age"
+msgstr ""
+
+#: 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 ""
+
+#: admin/ppolicy/class_ppolicy.inc:84
+msgid "Expiry warning delay"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:84
+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 ""
+
+#: admin/ppolicy/class_ppolicy.inc:89
+msgid "Grace period"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:89
+msgid ""
+"Number of times a user is allowed to successfully bind using an expired "
+"password"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:94
+msgid "Allow user change"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:94
+msgid "Whether users are allowed to change their own passwords"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:99
+msgid "Safe modify"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:99
+msgid ""
+"Whether a user must send the current password during a password modification"
+" operation"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:104
+msgid "Check quality"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:104
+msgid "Decides what to do if the function in \"Check module\" is not available"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:107
+msgid "Disabled"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:107
+msgid "Ignore errors"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:107
+msgid "Reject on errors"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:110
+msgid "Check module"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:110
+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 ""
+
+#: admin/ppolicy/class_ppolicy.inc:116
+msgid "Lock out"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:120
+msgid "Activate lock out"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:120
+msgid ""
+"Whether to lock an account that had more consecutive failed bind attempts "
+"with invalid passwords than is defined by \"Maximum failures\""
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:125
+msgid "Lock out duration"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:125
+msgid ""
+"Time the account remains locked after an automatic lock out (0 means for "
+"ever)"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:130
+msgid "Maximum failures"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:130
+msgid ""
+"Number of consecutive password failures allowed before automatic lock out"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:135
+msgid "Failure count interval"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:135
+msgid ""
+"Time after which the count of consecutive password failures is reset even if"
+" no successful authentication has occurred"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:140
+msgid "Must change"
+msgstr ""
+
+#: admin/ppolicy/class_ppolicy.inc:140
+msgid ""
+"Whether the user must change their password after an account is reset by an "
+"administrator following an automatic lockout"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:29
+msgid "Ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:30
+msgid "FusionDirectory ppolicy plugin configuration"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:43
+msgid "Ppolicy plugin"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Ppolicy RDN"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:46
+msgid "Branch in which ppolicies will be stored"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "Default ppolicy cn"
+msgstr ""
+
+#: config/ppolicy/class_ppolicyConfig.inc:51
+msgid "What you put as default ppolicy in the overlay config"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:27
+msgid "Ppolicy"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:28
+msgid "Statistics about ppolicy expired users"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:40
+msgid "Expired accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:45
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
+msgid "Locked accounts"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:58
+msgid "Login"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:59
+#: addons/dashboard/class_dashBoardPPolicy.inc:64
+msgid "Name"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:60
+#: addons/dashboard/class_dashBoardPPolicy.inc:66
+msgid "Phone number"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:61
+msgid "Expiration date"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:65
+msgid "Email"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:86
+#: addons/dashboard/class_dashBoardPPolicy.inc:139
+msgid "Configuration error"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:87
+#, php-format
+msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardPPolicy.inc:140
+#, php-format
+msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:30
+msgid "Edit user's password policy"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:47
+msgid "Use a specific policy for this user"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:51
+msgid "Last time the password for the entry was changed"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Account locked time"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:55
+msgid "Time the account was locked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Reset locking / force change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:59
+msgid "Resets the lock status of this account and/or force a password change"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Force password change (resets locking)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:62
+msgid "Reset locking (same password)"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:77
+msgid "Use the default"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:83
+msgid "Never"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:90
+msgid "Unlocked"
+msgstr ""
+
+#: personal/ppolicy/class_ppolicyAccount.inc:92
+msgid "Locked permanently"
+msgstr ""
+
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
+msgid "There is one locked account"
+msgid_plural "There are %1 locked accounts"
+msgstr[0] ""
+
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
+msgid "There is no locked account"
+msgstr ""
+
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:11
+msgid "Manager concerned"
+msgstr ""
+
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:14
+msgid "uid"
+msgstr ""
+
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:17
+msgid "cn"
+msgstr ""
+
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:20
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:32
+msgid "telephoneNumber"
+msgstr ""
+
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:23
+msgid "pwdAccountLockedTime"
+msgstr ""
+
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:26
+msgid "manager"
+msgstr ""
+
+#: addons/dashboard/ppolicy_locked_accounts.tpl.c:29
+msgid "mail"
+msgstr ""
diff --git a/puppet/locale/af_ZA/fusiondirectory.po b/puppet/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..674e06c3be380aeadf8829206f66bd0e5e7f9bdd
--- /dev/null
+++ b/puppet/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,84 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/systems/services/puppet/class_servicePuppet.inc:28
+#: admin/systems/services/puppet/class_servicePuppet.inc:42
+msgid "Puppet server"
+msgstr ""
+
+#: admin/systems/services/puppet/class_servicePuppet.inc:29
+msgid "This service allows you to use a puppet server"
+msgstr ""
+
+#: admin/systems/services/puppet/class_servicePuppet.inc:46
+msgid "Environments"
+msgstr ""
+
+#: admin/systems/services/puppet/class_servicePuppet.inc:47
+msgid "Available environments for puppet nodes"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:32
+msgid "Puppet node settings"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:35
+msgid "Puppet class"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:35
+msgid "Puppet Node Class"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:37
+msgid "Parent node"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:37
+msgid "Puppet Parent Node"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:38
+msgid "Environment"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:38
+msgid "Puppet Node Environment"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:41
+msgid "A variable setting for puppet"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:44
+msgid "Name of the variable"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:45
+msgid "Value of the variable"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:65
+msgid "Puppet"
+msgstr ""
+
+#: 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/ar/fusiondirectory.po b/puppet/locale/ar/fusiondirectory.po
index a7c23d19c16e40577e624baf685c29498c018e84..5da0fa28d9b7c021122814a3c3d16372f91d5678 100644
--- a/puppet/locale/ar/fusiondirectory.po
+++ b/puppet/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/puppet/locale/ca/fusiondirectory.po b/puppet/locale/ca/fusiondirectory.po
index ce4699890e4db3b6cd63eb4a3c93f39fda2c87dd..2a7288f358f6c2830f08535f0a38839f0eb0228f 100644
--- a/puppet/locale/ca/fusiondirectory.po
+++ b/puppet/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/puppet/locale/cs_CZ/fusiondirectory.po b/puppet/locale/cs_CZ/fusiondirectory.po
index 9a5899bc8b3348227aad52470f984fc0fb9fc533..3c91af7e1743c3bb059ccba739c36551d3c02926 100644
--- a/puppet/locale/cs_CZ/fusiondirectory.po
+++ b/puppet/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/systems/services/puppet/class_servicePuppet.inc:28
 #: admin/systems/services/puppet/class_servicePuppet.inc:42
diff --git a/puppet/locale/de/fusiondirectory.po b/puppet/locale/de/fusiondirectory.po
index e7b9f2737cfb9b8c840f243c955259f1feafc1ba..3211d30e5948f6415c7cd95f8ceb24a4787d4116 100644
--- a/puppet/locale/de/fusiondirectory.po
+++ b/puppet/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/puppet/locale/el_GR/fusiondirectory.po b/puppet/locale/el_GR/fusiondirectory.po
index df638c2d5f458004f4f7db54a39b36029d24df96..bad5bc16bba84f99f6725f2e608f330cf24ca2bc 100644
--- a/puppet/locale/el_GR/fusiondirectory.po
+++ b/puppet/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/puppet/locale/es/fusiondirectory.po b/puppet/locale/es/fusiondirectory.po
index c0d6fad61da50b35acd1cf6b1bfc894e4e9eec81..b0b1be489877cc8e8f52571f067cea5dc6f228bc 100644
--- a/puppet/locale/es/fusiondirectory.po
+++ b/puppet/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/puppet/locale/es_CO/fusiondirectory.po b/puppet/locale/es_CO/fusiondirectory.po
index 1690c87d92c5dce1c02bf62d78a29c11fa9d15cc..9c625c63208885f6af631b2aa80bdc60b8872f53 100644
--- a/puppet/locale/es_CO/fusiondirectory.po
+++ b/puppet/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/puppet/locale/es_VE/fusiondirectory.po b/puppet/locale/es_VE/fusiondirectory.po
index ed9a94de8d2bdd8950b891dcd0adeaa3d85b39af..cfde0415cfd913b5c675923b6c95992c6e842535 100644
--- a/puppet/locale/es_VE/fusiondirectory.po
+++ b/puppet/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/puppet/locale/fa_IR/fusiondirectory.po b/puppet/locale/fa_IR/fusiondirectory.po
index 976b5c700f9ffc843e7b8d308e7c1a8870028086..b7be275d5cdb84986c9473a9d8da2509e779335c 100644
--- a/puppet/locale/fa_IR/fusiondirectory.po
+++ b/puppet/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/systems/services/puppet/class_servicePuppet.inc:28
 #: admin/systems/services/puppet/class_servicePuppet.inc:42
diff --git a/puppet/locale/fi_FI/fusiondirectory.po b/puppet/locale/fi_FI/fusiondirectory.po
index ef3e53e5c26f970a6b34561614f2fd3dbbe1349f..6b63d10f5764f7d02bc032321f5b5767e754425b 100644
--- a/puppet/locale/fi_FI/fusiondirectory.po
+++ b/puppet/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/puppet/locale/fr/fusiondirectory.po b/puppet/locale/fr/fusiondirectory.po
index 96f1a8249806bdbd57f88d1a0544119a04bf6be4..ea31ab28bbe0f92450eb8d9babbcaa0049186442 100644
--- a/puppet/locale/fr/fusiondirectory.po
+++ b/puppet/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/puppet/locale/hu_HU/fusiondirectory.po b/puppet/locale/hu_HU/fusiondirectory.po
index a1a701c2fab6864ef60d398a36e0f0828ec4076e..aa4bdb12528219d354d3557edb878c0a2e2eab36 100644
--- a/puppet/locale/hu_HU/fusiondirectory.po
+++ b/puppet/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/puppet/locale/id/fusiondirectory.po b/puppet/locale/id/fusiondirectory.po
index e953a57a8071fb79da4669d169b87cf4db6d603f..03d3f2f0929202652d02698f800d79bb2efd180b 100644
--- a/puppet/locale/id/fusiondirectory.po
+++ b/puppet/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/puppet/locale/it_IT/fusiondirectory.po b/puppet/locale/it_IT/fusiondirectory.po
index 8909af7ae976ba887beba40135435d9e2aa0fa01..8303b60ac432b022039706359f7e67936f0412ba 100644
--- a/puppet/locale/it_IT/fusiondirectory.po
+++ b/puppet/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/puppet/locale/ja/fusiondirectory.po b/puppet/locale/ja/fusiondirectory.po
index 0a8e28abf6c71746b75bb23de556a7e041053dfa..2e888892049e7e3b68e9a3757f73fa7bf5e5bc3f 100644
--- a/puppet/locale/ja/fusiondirectory.po
+++ b/puppet/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/puppet/locale/ko/fusiondirectory.po b/puppet/locale/ko/fusiondirectory.po
index a02f8d844d9f4110e3ff6f0e9b5608b29890a15e..bde084d80d8eebe3e7661660d4188fc81f911f42 100644
--- a/puppet/locale/ko/fusiondirectory.po
+++ b/puppet/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
 "MIME-Version: 1.0\n"
diff --git a/puppet/locale/lv/fusiondirectory.po b/puppet/locale/lv/fusiondirectory.po
index 1d2ba36f72a3b01dbb872b03bb2103306c0bdb73..e23f0afeae52e781ebf10d5b3c72f82578745c19 100644
--- a/puppet/locale/lv/fusiondirectory.po
+++ b/puppet/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/puppet/locale/nb/fusiondirectory.po b/puppet/locale/nb/fusiondirectory.po
index c2e0479502ef3af0a072368e61b08a0b9637ec72..4eea56acaac191e095b12bb0626fbc582c32cc82 100644
--- a/puppet/locale/nb/fusiondirectory.po
+++ b/puppet/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/puppet/locale/nl/fusiondirectory.po b/puppet/locale/nl/fusiondirectory.po
index 86c4c5e11f4230032ea84c45256ea9f60a054203..98d37980106d7c165d47456ebd1793cd9b1acb46 100644
--- a/puppet/locale/nl/fusiondirectory.po
+++ b/puppet/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/puppet/locale/pl/fusiondirectory.po b/puppet/locale/pl/fusiondirectory.po
index 0439e2b3785fa6d067b70da32961c50828578868..040851460ed2a8b546c4380a1a91ad2844363bc3 100644
--- a/puppet/locale/pl/fusiondirectory.po
+++ b/puppet/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/puppet/locale/pt/fusiondirectory.po b/puppet/locale/pt/fusiondirectory.po
index 32ad4c76c72e3c96c6b5bf0b00ee69d3939443cd..ff3927dfcf61024c0b04dbbeb44e9d9d0e521c42 100644
--- a/puppet/locale/pt/fusiondirectory.po
+++ b/puppet/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/puppet/locale/pt_BR/fusiondirectory.po b/puppet/locale/pt_BR/fusiondirectory.po
index 246d8b50af8876912b544669d1491f91508c5797..5c3382ec2d99015026a70614d4c4992ae46866ea 100644
--- a/puppet/locale/pt_BR/fusiondirectory.po
+++ b/puppet/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/puppet/locale/ru/fusiondirectory.po b/puppet/locale/ru/fusiondirectory.po
index 0bfb57e3d4e46569cc922038a59c86d7a2d2b3bc..c27e199bb3502254239a5d4886c95538fd7af1da 100644
--- a/puppet/locale/ru/fusiondirectory.po
+++ b/puppet/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/puppet/locale/ru@petr1708/fusiondirectory.po b/puppet/locale/ru@petr1708/fusiondirectory.po
index e44a60f193b1cb340b61daa71d8c34591ff3d371..0cfe5f6c2c1025381e4d8e91a38d495a6273a94f 100644
--- a/puppet/locale/ru@petr1708/fusiondirectory.po
+++ b/puppet/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/puppet/locale/sv/fusiondirectory.po b/puppet/locale/sv/fusiondirectory.po
index 97154d877542a962bf076b14a90d258b0a88f84b..babd03cb722a49b5927cfde11158a81a661f774c 100644
--- a/puppet/locale/sv/fusiondirectory.po
+++ b/puppet/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/puppet/locale/tr_TR/fusiondirectory.po b/puppet/locale/tr_TR/fusiondirectory.po
index 9cda982b7994a3f2f58f86fbda9a8bbe79997625..58c0f74c5bf0c461e37ded7c8fe5e6b7a39e0323 100644
--- a/puppet/locale/tr_TR/fusiondirectory.po
+++ b/puppet/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/puppet/locale/ug/fusiondirectory.po b/puppet/locale/ug/fusiondirectory.po
index 963494b635b6c1d7e31924c364b103b93c90281d..8c1c9e8b037c446c37a6cdd9adc42505aa647a5c 100644
--- a/puppet/locale/ug/fusiondirectory.po
+++ b/puppet/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/puppet/locale/vi_VN/fusiondirectory.po b/puppet/locale/vi_VN/fusiondirectory.po
index 194968006638b8c341a998e61daaad3d0a0e6a83..1e5eaf5b9fff0a24eacf97f14023c8ec59a0125b 100644
--- a/puppet/locale/vi_VN/fusiondirectory.po
+++ b/puppet/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/puppet/locale/zh/fusiondirectory.po b/puppet/locale/zh/fusiondirectory.po
index 0ecbe9bc40a6487300ed25d0b2b76713d0850b3c..fd10b31c8173f9cc537fe3967dd36d67174ae0ae 100644
--- a/puppet/locale/zh/fusiondirectory.po
+++ b/puppet/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/puppet/locale/zh_TW/fusiondirectory.po b/puppet/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..aacb930c577fd13c6236af084cc9a9bf3a0d95e1
--- /dev/null
+++ b/puppet/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,84 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/systems/services/puppet/class_servicePuppet.inc:28
+#: admin/systems/services/puppet/class_servicePuppet.inc:42
+msgid "Puppet server"
+msgstr ""
+
+#: admin/systems/services/puppet/class_servicePuppet.inc:29
+msgid "This service allows you to use a puppet server"
+msgstr ""
+
+#: admin/systems/services/puppet/class_servicePuppet.inc:46
+msgid "Environments"
+msgstr ""
+
+#: admin/systems/services/puppet/class_servicePuppet.inc:47
+msgid "Available environments for puppet nodes"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:32
+msgid "Puppet node settings"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:35
+msgid "Puppet class"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:35
+msgid "Puppet Node Class"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:37
+msgid "Parent node"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:37
+msgid "Puppet Parent Node"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:38
+msgid "Environment"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:38
+msgid "Puppet Node Environment"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:41
+msgid "A variable setting for puppet"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:44
+msgid "Name of the variable"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:45
+msgid "Value of the variable"
+msgstr ""
+
+#: admin/systems/puppet/class_puppetNode.inc:65
+msgid "Puppet"
+msgstr ""
+
+#: 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/af_ZA/fusiondirectory.po b/pureftpd/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..ced31bc02be9bed97095d7185fea89cca7379e95
--- /dev/null
+++ b/pureftpd/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,98 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/pureftpd/class_pureftpdAccount.inc:33
+msgid "Ftp"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:34
+msgid "Pure ftp account"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:34
+msgid "Connectivity addon"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:49
+msgid "Bandwidth"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:52
+#: personal/pureftpd/class_pureftpdAccount.inc:53
+msgid "Upload bandwidth"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:52
+#: personal/pureftpd/class_pureftpdAccount.inc:61
+msgid " (kb/sec)"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:61
+msgid "Download bandwidth"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:62
+msgid "Download bandwidth in kb/sec"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:72
+msgid "Ratio"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:75
+#: personal/pureftpd/class_pureftpdAccount.inc:76
+msgid "Uploaded files"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:84
+#: personal/pureftpd/class_pureftpdAccount.inc:85
+msgid "Downloaded files"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:98
+msgid "Files"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:99
+msgid "Quota files"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:107
+msgid "Size"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:107
+msgid " (MB)"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:108
+msgid "Files size"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:118
+msgid "Miscellaneous"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:121
+msgid "Enable FTP access"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:121
+msgid "Enable or disable FTP access"
+msgstr ""
diff --git a/pureftpd/locale/ar/fusiondirectory.po b/pureftpd/locale/ar/fusiondirectory.po
index 650737e7a64e3df31f93e87f012c2bebd819cd61..c04d2d6704d38bfae64c7d54aae836177ef36e82 100644
--- a/pureftpd/locale/ar/fusiondirectory.po
+++ b/pureftpd/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/pureftpd/locale/ca/fusiondirectory.po b/pureftpd/locale/ca/fusiondirectory.po
index 9033826817629497d59ad0f6f5addace6688368f..e804195a18dd8fa6ebafe74b394c569e62ef5eed 100644
--- a/pureftpd/locale/ca/fusiondirectory.po
+++ b/pureftpd/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/pureftpd/locale/cs_CZ/fusiondirectory.po b/pureftpd/locale/cs_CZ/fusiondirectory.po
index d74cc6549463cbabf214f92451173eef6530f107..a7c25db488fc94fb181c72f97643834698ec43d1 100644
--- a/pureftpd/locale/cs_CZ/fusiondirectory.po
+++ b/pureftpd/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:33
 msgid "Ftp"
diff --git a/pureftpd/locale/de/fusiondirectory.po b/pureftpd/locale/de/fusiondirectory.po
index 1e2ae96083036b6e189fdab439408428042ed0d9..cd21815c86c02802dabc8d5fff36513e7927afb8 100644
--- a/pureftpd/locale/de/fusiondirectory.po
+++ b/pureftpd/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/pureftpd/locale/el_GR/fusiondirectory.po b/pureftpd/locale/el_GR/fusiondirectory.po
index e89f31396a77b3a39192a6d55810292babdd1990..c8f4ac129c6702db5fd46c4c4ffaf368b862f780 100644
--- a/pureftpd/locale/el_GR/fusiondirectory.po
+++ b/pureftpd/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/pureftpd/locale/es/fusiondirectory.po b/pureftpd/locale/es/fusiondirectory.po
index 0ba685e1d6688fe54cf921da1841a334f78af339..03c9e4529ce878cc0c8a86b74f0cf54000470db9 100644
--- a/pureftpd/locale/es/fusiondirectory.po
+++ b/pureftpd/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/pureftpd/locale/es_CO/fusiondirectory.po b/pureftpd/locale/es_CO/fusiondirectory.po
index 27c4efd422506f40b9e36e5e1236d616b9ee889f..43a80107c4a75c269db8f0a8f555c49fc27fdf9e 100644
--- a/pureftpd/locale/es_CO/fusiondirectory.po
+++ b/pureftpd/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/pureftpd/locale/es_VE/fusiondirectory.po b/pureftpd/locale/es_VE/fusiondirectory.po
index 0585e35fb5767370d537ee197c06f2c91737c51e..e601890c69cde7d645ffe1a5dc8a9ec2ca7578ee 100644
--- a/pureftpd/locale/es_VE/fusiondirectory.po
+++ b/pureftpd/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/pureftpd/locale/fa_IR/fusiondirectory.po b/pureftpd/locale/fa_IR/fusiondirectory.po
index 0679117df95ed1ab1650756b23072c8aa5bab251..282d697ccc1ddde463494190e1e1a42e40886978 100644
--- a/pureftpd/locale/fa_IR/fusiondirectory.po
+++ b/pureftpd/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:33
 msgid "Ftp"
diff --git a/pureftpd/locale/fi_FI/fusiondirectory.po b/pureftpd/locale/fi_FI/fusiondirectory.po
index 3c263ae3a143332d605659af93e29094b7113e18..b4c2fdd14d4eba5da8f721667568cc9339e2f2d1 100644
--- a/pureftpd/locale/fi_FI/fusiondirectory.po
+++ b/pureftpd/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/pureftpd/locale/fr/fusiondirectory.po b/pureftpd/locale/fr/fusiondirectory.po
index f13eb3beb9ed91a7388f5562ce239f9096841a24..c627722602dcc71d3548caefed14f149087a86df 100644
--- a/pureftpd/locale/fr/fusiondirectory.po
+++ b/pureftpd/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/pureftpd/locale/hu_HU/fusiondirectory.po b/pureftpd/locale/hu_HU/fusiondirectory.po
index 4ee93f5c8783a6dedbe25a35e7404b8e05419a7a..3cd1ba876ed629b15b3935f15331b113a407c30a 100644
--- a/pureftpd/locale/hu_HU/fusiondirectory.po
+++ b/pureftpd/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/pureftpd/locale/id/fusiondirectory.po b/pureftpd/locale/id/fusiondirectory.po
index 4d41e7d9e55f567dc358cafc106042b028cdfb3d..bad10fed2fa5b17338dcc65904d77915f7f8286e 100644
--- a/pureftpd/locale/id/fusiondirectory.po
+++ b/pureftpd/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/pureftpd/locale/it_IT/fusiondirectory.po b/pureftpd/locale/it_IT/fusiondirectory.po
index 682af283fb32cd98aa266b3c2877ab9b5032c9ca..95048def1e5371ed33e571af5ee56d54781eadf0 100644
--- a/pureftpd/locale/it_IT/fusiondirectory.po
+++ b/pureftpd/locale/it_IT/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: personal/pureftpd/class_pureftpdAccount.inc:33
 msgid "Ftp"
-msgstr "FtpTipo"
+msgstr "Ftp"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:34
 msgid "Pure ftp account"
diff --git a/pureftpd/locale/ja/fusiondirectory.po b/pureftpd/locale/ja/fusiondirectory.po
index e9f83adbde844788525988c2da2bb347aff68aec..527fcec43c47e2567254b6e3e34862ef61baf00d 100644
--- a/pureftpd/locale/ja/fusiondirectory.po
+++ b/pureftpd/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/pureftpd/locale/ko/fusiondirectory.po b/pureftpd/locale/ko/fusiondirectory.po
index 416798389bcd80a77308b963ad6f70c807c2ab08..b6bb11b20742e44a4bd5bc889d48f4ef65aeebaa 100644
--- a/pureftpd/locale/ko/fusiondirectory.po
+++ b/pureftpd/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
 "MIME-Version: 1.0\n"
diff --git a/pureftpd/locale/lv/fusiondirectory.po b/pureftpd/locale/lv/fusiondirectory.po
index 633b334e0e8d34418706af1fcba6b07960d59217..d9b217c72fa6d94d1bdd2e9a8221ead8fe55e3ac 100644
--- a/pureftpd/locale/lv/fusiondirectory.po
+++ b/pureftpd/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/pureftpd/locale/nb/fusiondirectory.po b/pureftpd/locale/nb/fusiondirectory.po
index a745ddfee94775ff6124ab15bf3968a21a4a8f65..f9ee242d390b124f94c44f1c94220d3104a005db 100644
--- a/pureftpd/locale/nb/fusiondirectory.po
+++ b/pureftpd/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/pureftpd/locale/nl/fusiondirectory.po b/pureftpd/locale/nl/fusiondirectory.po
index 7e0fe4a62e49cf888ef09aedc2c0ece41665d26f..499b0f56f6cc897c04267f59a38ecc1e416553a5 100644
--- a/pureftpd/locale/nl/fusiondirectory.po
+++ b/pureftpd/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/pureftpd/locale/pl/fusiondirectory.po b/pureftpd/locale/pl/fusiondirectory.po
index 7cb99332ad7aa4b2be3e053fb44b7b006a7edf1d..ea2f88eb81d59e3b8325359e4841e9756f804649 100644
--- a/pureftpd/locale/pl/fusiondirectory.po
+++ b/pureftpd/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/pureftpd/locale/pt/fusiondirectory.po b/pureftpd/locale/pt/fusiondirectory.po
index 8e845b52fdfba42bf050a1e04434608b53282310..361f26759eed0f0fc85f29120ccde821bbead1b8 100644
--- a/pureftpd/locale/pt/fusiondirectory.po
+++ b/pureftpd/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
diff --git a/pureftpd/locale/pt_BR/fusiondirectory.po b/pureftpd/locale/pt_BR/fusiondirectory.po
index 79c84348fb129819b6231d76636139daefa7c341..c31c299ecf742d30f7a8bfd88577c4dd72cf0152 100644
--- a/pureftpd/locale/pt_BR/fusiondirectory.po
+++ b/pureftpd/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/pureftpd/locale/ru/fusiondirectory.po b/pureftpd/locale/ru/fusiondirectory.po
index c406c3b9da77a7babfa4836fb7a5ed431beef593..81ffd687db054c533cc690d11980a540071c7d3e 100644
--- a/pureftpd/locale/ru/fusiondirectory.po
+++ b/pureftpd/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/pureftpd/locale/ru@petr1708/fusiondirectory.po b/pureftpd/locale/ru@petr1708/fusiondirectory.po
index 966f5fab831c6ff814b8533ef549bb4afbcefcc6..db0fca5564d9c7acaee0e45c75bb1caa94277a78 100644
--- a/pureftpd/locale/ru@petr1708/fusiondirectory.po
+++ b/pureftpd/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/pureftpd/locale/sv/fusiondirectory.po b/pureftpd/locale/sv/fusiondirectory.po
index 4880d808a971ba1c17bf2a4cebb561d85dd947f9..65510bb7daeb05cf261a5fbeaebf351d0e65e28b 100644
--- a/pureftpd/locale/sv/fusiondirectory.po
+++ b/pureftpd/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/pureftpd/locale/tr_TR/fusiondirectory.po b/pureftpd/locale/tr_TR/fusiondirectory.po
index 88bc88133cbeb16132cce8e762a434a8820b6477..1290e728791ee18a8044c82e551e0b265b10e9c8 100644
--- a/pureftpd/locale/tr_TR/fusiondirectory.po
+++ b/pureftpd/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/pureftpd/locale/ug/fusiondirectory.po b/pureftpd/locale/ug/fusiondirectory.po
index b1d3e48880cf54ca1c9db00d04fde53873983127..2a58cb761a394a5dfe2f7912f9e25bd84337b453 100644
--- a/pureftpd/locale/ug/fusiondirectory.po
+++ b/pureftpd/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/pureftpd/locale/vi_VN/fusiondirectory.po b/pureftpd/locale/vi_VN/fusiondirectory.po
index a411ec7c0a2226d7f04de9c47215536ccc9b4e9b..05ad0947ce32a86ea1877bfae1230302a5934778 100644
--- a/pureftpd/locale/vi_VN/fusiondirectory.po
+++ b/pureftpd/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
diff --git a/pureftpd/locale/zh/fusiondirectory.po b/pureftpd/locale/zh/fusiondirectory.po
index ca22e0743bc2d8801d54bddc4127b06d9b528307..1e2720c478190de2bd379304fce3ada14be5257a 100644
--- a/pureftpd/locale/zh/fusiondirectory.po
+++ b/pureftpd/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/pureftpd/locale/zh_TW/fusiondirectory.po b/pureftpd/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..d23c38a5afab4e4f927400572f292128f1db36c9
--- /dev/null
+++ b/pureftpd/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,98 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: personal/pureftpd/class_pureftpdAccount.inc:33
+msgid "Ftp"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:34
+msgid "Pure ftp account"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:34
+msgid "Connectivity addon"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:49
+msgid "Bandwidth"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:52
+#: personal/pureftpd/class_pureftpdAccount.inc:53
+msgid "Upload bandwidth"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:52
+#: personal/pureftpd/class_pureftpdAccount.inc:61
+msgid " (kb/sec)"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:61
+msgid "Download bandwidth"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:62
+msgid "Download bandwidth in kb/sec"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:72
+msgid "Ratio"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:75
+#: personal/pureftpd/class_pureftpdAccount.inc:76
+msgid "Uploaded files"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:84
+#: personal/pureftpd/class_pureftpdAccount.inc:85
+msgid "Downloaded files"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:98
+msgid "Files"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:99
+msgid "Quota files"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:107
+msgid "Size"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:107
+msgid " (MB)"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:108
+msgid "Files size"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:118
+msgid "Miscellaneous"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:121
+msgid "Enable FTP access"
+msgstr ""
+
+#: personal/pureftpd/class_pureftpdAccount.inc:121
+msgid "Enable or disable FTP access"
+msgstr ""
diff --git a/quota/locale/af_ZA/fusiondirectory.po b/quota/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..8bd19bf14a027ce260173933265ebf5ac68e8fc3
--- /dev/null
+++ b/quota/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,230 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/systems/services/quota/class_serviceQuota.inc:29
+#: admin/systems/services/quota/class_serviceQuota.inc:30
+msgid "Quota service"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:30
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:42
+msgid "Shares"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:46
+msgid "Quotas for the shares this server hosts"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:50
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:50
+msgid "Device concerned by this quota"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:54
+msgid "Quota block size"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:54
+msgid "Quota block size on this share (usually 1024)"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:63
+msgid "Comment"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:63
+msgid "Short comment about this quota"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:78
+msgid "Quota warning message"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:81
+msgid "Charset"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:81
+msgid "Charset use for the message"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:85
+msgid "Mail command"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:85
+msgid "Command allowing the server to send mails"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:89
+msgid "Support contact"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:89
+msgid "Email address to contact the administrator"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:93
+msgid "From"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:93
+msgid "Email from which the email is sent"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:97
+msgid "CC"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:97
+msgid "Send a copy of this email to"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:101
+msgid "Subject"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:101
+msgid "Subject of the sent warning email"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:105
+msgid "Content"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:105
+msgid "Content of the sent email"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:109
+msgid "Signature"
+msgstr ""
+
+#: 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:115
+msgid "LDAP message support"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:118
+msgid "LDAP server"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:118
+msgid "The LDAP server to bind to"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:122
+msgid "Bind user dn"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:122
+msgid "The user dn to use for bind"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:126
+msgid "Bind user password"
+msgstr ""
+
+#: 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:159
+msgid "Warning"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:159
+#, php-format
+msgid "Invalid value in encodings : %s"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:176
+#, php-format
+msgid "(%s by %s)"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota information"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota information for this user"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:142
+msgid "Block hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:142
+msgid "Hard limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Soft limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:160
+msgid "Inode hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:160
+msgid "Hard limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:169
+msgid "Server"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:169
+msgid "Server hosting the device this quota is for"
+msgstr ""
diff --git a/quota/locale/ar/fusiondirectory.po b/quota/locale/ar/fusiondirectory.po
index 6094bf2313aeaab0c75a92e05d57ad7d97c87283..66d961eb0e639fbe440e05ebd7d04ee9c863c099 100644
--- a/quota/locale/ar/fusiondirectory.po
+++ b/quota/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/quota/locale/ca/fusiondirectory.po b/quota/locale/ca/fusiondirectory.po
index adc232d22efc1440759b3008c63519286c14e372..7e05cee45e788f620f2af92c032c5986c2e08d81 100644
--- a/quota/locale/ca/fusiondirectory.po
+++ b/quota/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/quota/locale/cs_CZ/fusiondirectory.po b/quota/locale/cs_CZ/fusiondirectory.po
index 6129274ea400d0e9c0c2297a6bbe914d5a8c8369..2d01f94f3316bf9a871ef1f1ccc0a586fa91279f 100644
--- a/quota/locale/cs_CZ/fusiondirectory.po
+++ b/quota/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
diff --git a/quota/locale/de/fusiondirectory.po b/quota/locale/de/fusiondirectory.po
index 2940e39e4c2757c8c78b8596955b1f2703e0e874..93155829e6ba54ea3ab5ec916334f75ecbf5b798 100644
--- a/quota/locale/de/fusiondirectory.po
+++ b/quota/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/quota/locale/el_GR/fusiondirectory.po b/quota/locale/el_GR/fusiondirectory.po
index f8577309c0549fbb51b71dfcb0e7b0ddac5ea65a..ad294aade5166e2fd3804f3021aa1e1efee60451 100644
--- a/quota/locale/el_GR/fusiondirectory.po
+++ b/quota/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/quota/locale/es/fusiondirectory.po b/quota/locale/es/fusiondirectory.po
index fd2f924eb2e7fed9d76dbe01d03e453d2732922e..c5b46d01fcd817a1b41a90ba33838e7e05171c16 100644
--- a/quota/locale/es/fusiondirectory.po
+++ b/quota/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/quota/locale/es_CO/fusiondirectory.po b/quota/locale/es_CO/fusiondirectory.po
index 32a444d323b0ed022abf76babdafa1fa9c6ecfb1..d9c8bb9be51ca4e594db7cc0d4d4036b02fe20a5 100644
--- a/quota/locale/es_CO/fusiondirectory.po
+++ b/quota/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/quota/locale/es_VE/fusiondirectory.po b/quota/locale/es_VE/fusiondirectory.po
index 477fe871b54fb52723a2a6af55097f215f892d9a..3a1af1e7640e1af100aa7c6e49253174633a5b88 100644
--- a/quota/locale/es_VE/fusiondirectory.po
+++ b/quota/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/quota/locale/fa_IR/fusiondirectory.po b/quota/locale/fa_IR/fusiondirectory.po
index 082d9f37ed69e87bdab0212561d976209ac13bca..eb8b045469c79a54b242b8cd02e874be9a4cbb15 100644
--- a/quota/locale/fa_IR/fusiondirectory.po
+++ b/quota/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:29
 #: admin/systems/services/quota/class_serviceQuota.inc:30
diff --git a/quota/locale/fi_FI/fusiondirectory.po b/quota/locale/fi_FI/fusiondirectory.po
index ab294fe4d0dc2ea1afc6414c240eab36a1c5b7e1..867c234bbca11f5650bc5e6a5ac8f34ddcc4382d 100644
--- a/quota/locale/fi_FI/fusiondirectory.po
+++ b/quota/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/quota/locale/fr/fusiondirectory.po b/quota/locale/fr/fusiondirectory.po
index c97acea59304c27dcdf73fa6874b5a2034489ab6..1db9085162acfb27f3d5c184e98781651937c64e 100644
--- a/quota/locale/fr/fusiondirectory.po
+++ b/quota/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/quota/locale/hu_HU/fusiondirectory.po b/quota/locale/hu_HU/fusiondirectory.po
index 102ccd7f2fad1f546260e734bfd2c863560cada8..4ad1fb11b31445ff44d931248f70253b986df606 100644
--- a/quota/locale/hu_HU/fusiondirectory.po
+++ b/quota/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/quota/locale/id/fusiondirectory.po b/quota/locale/id/fusiondirectory.po
index 60f716d27ceff44e621aa012cb089f6363250aa1..786fb2601d6f8da50e0e6d156700fb5b93854e05 100644
--- a/quota/locale/id/fusiondirectory.po
+++ b/quota/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/quota/locale/it_IT/fusiondirectory.po b/quota/locale/it_IT/fusiondirectory.po
index b3d91da17f21a4e67812bf00e571f23021ce5c4a..39cef95c28016daf0f2b6715fb7b73f502437cd3 100644
--- a/quota/locale/it_IT/fusiondirectory.po
+++ b/quota/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/quota/locale/ja/fusiondirectory.po b/quota/locale/ja/fusiondirectory.po
index 9c448d7cb085eee012037c9a73234dc0869bfaa1..216ff47566748138509b876250a8ae0f100699b7 100644
--- a/quota/locale/ja/fusiondirectory.po
+++ b/quota/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/quota/locale/ko/fusiondirectory.po b/quota/locale/ko/fusiondirectory.po
index 65a4917a14be38f4e70f270a1e4a4fec8e6a2fab..6870dfbf3f8da8db6817e2ab6e718c50b0e4dcf9 100644
--- a/quota/locale/ko/fusiondirectory.po
+++ b/quota/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/quota/locale/lv/fusiondirectory.po b/quota/locale/lv/fusiondirectory.po
index 74521c0d9c16d81bbedcbcc5185d4cf59d421de9..29d7442d104c14aa4e7351272edc79884129c9f9 100644
--- a/quota/locale/lv/fusiondirectory.po
+++ b/quota/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/quota/locale/nb/fusiondirectory.po b/quota/locale/nb/fusiondirectory.po
index da24068c8f33831a957131ac4b364317adb20ca4..5d7605c6a67a5a6302b8ca8be7cbe5f2d4b1bcc2 100644
--- a/quota/locale/nb/fusiondirectory.po
+++ b/quota/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/quota/locale/nl/fusiondirectory.po b/quota/locale/nl/fusiondirectory.po
index 45edc8ad79459040ed91e9499b2c15d2da84ce27..33cd9c237a078f81705db7f3244fc45cb58031d3 100644
--- a/quota/locale/nl/fusiondirectory.po
+++ b/quota/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/quota/locale/pl/fusiondirectory.po b/quota/locale/pl/fusiondirectory.po
index c5566d76d09002f7b533b437ba87aab8903c7ac9..817dd03664730955bfa16d1ece9e696e9d008089 100644
--- a/quota/locale/pl/fusiondirectory.po
+++ b/quota/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/quota/locale/pt/fusiondirectory.po b/quota/locale/pt/fusiondirectory.po
index 41ad2c1a9444d9380cf0d255ad6d33b6eafd3f8a..6e0da958ba17db59b5226a034f42251e829b4a14 100644
--- a/quota/locale/pt/fusiondirectory.po
+++ b/quota/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/quota/locale/pt_BR/fusiondirectory.po b/quota/locale/pt_BR/fusiondirectory.po
index faf2bda600fc9f0cac9cdacd03251136a014a89f..1c6fef0c55dfb86c12ae581294583f5cb01c1ab4 100644
--- a/quota/locale/pt_BR/fusiondirectory.po
+++ b/quota/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/quota/locale/ru/fusiondirectory.po b/quota/locale/ru/fusiondirectory.po
index f8614b46f175140fc50d98c6cc851c8ec6ed313c..5dc483615599b94707b36b07eea0bd76c0b84d41 100644
--- a/quota/locale/ru/fusiondirectory.po
+++ b/quota/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/quota/locale/ru@petr1708/fusiondirectory.po b/quota/locale/ru@petr1708/fusiondirectory.po
index 0fe1a8dc6abebccdfbee78fd64c1daec293d2bb8..41124d058ae883f6ca3c9de5c56173afe3c5fa9d 100644
--- a/quota/locale/ru@petr1708/fusiondirectory.po
+++ b/quota/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/quota/locale/sv/fusiondirectory.po b/quota/locale/sv/fusiondirectory.po
index fef3c55ed08b8f18db7fa7694fc011619c859a65..2fd02580fea438af98d596fafee3c7f74f4d75f7 100644
--- a/quota/locale/sv/fusiondirectory.po
+++ b/quota/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/quota/locale/tr_TR/fusiondirectory.po b/quota/locale/tr_TR/fusiondirectory.po
index 37e798f6b24995697418e16fa6aeea45d8b74800..6d427570ecf53dba24ead13a978b7cf15454e4f4 100644
--- a/quota/locale/tr_TR/fusiondirectory.po
+++ b/quota/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/quota/locale/ug/fusiondirectory.po b/quota/locale/ug/fusiondirectory.po
index 35ca1cc7c5a4cbc373717b9d960af854894130f4..6e0f80335bd173e7c07b83136a8df1c173354388 100644
--- a/quota/locale/ug/fusiondirectory.po
+++ b/quota/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/quota/locale/vi_VN/fusiondirectory.po b/quota/locale/vi_VN/fusiondirectory.po
index 9a5a13283d3df479d3904da45afee248baaa84ed..440f16618dec803478fc779397906dd952f96700 100644
--- a/quota/locale/vi_VN/fusiondirectory.po
+++ b/quota/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/quota/locale/zh/fusiondirectory.po b/quota/locale/zh/fusiondirectory.po
index 9c558f352bf92539f450a157f9939819ff199ef7..f9fcabb755dd0a672c9ef508b2b914731b975f8b 100644
--- a/quota/locale/zh/fusiondirectory.po
+++ b/quota/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/quota/locale/zh_TW/fusiondirectory.po b/quota/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..1a6312a1d0562bdfca15af4b589fb9cbbdf34129
--- /dev/null
+++ b/quota/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,230 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/systems/services/quota/class_serviceQuota.inc:29
+#: admin/systems/services/quota/class_serviceQuota.inc:30
+msgid "Quota service"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:30
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:42
+msgid "Shares"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:46
+msgid "Quotas for the shares this server hosts"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:50
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:50
+msgid "Device concerned by this quota"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:54
+msgid "Quota block size"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:54
+msgid "Quota block size on this share (usually 1024)"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:63
+msgid "Comment"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:63
+msgid "Short comment about this quota"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:78
+msgid "Quota warning message"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:81
+msgid "Charset"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:81
+msgid "Charset use for the message"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:85
+msgid "Mail command"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:85
+msgid "Command allowing the server to send mails"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:89
+msgid "Support contact"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:89
+msgid "Email address to contact the administrator"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:93
+msgid "From"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:93
+msgid "Email from which the email is sent"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:97
+msgid "CC"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:97
+msgid "Send a copy of this email to"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:101
+msgid "Subject"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:101
+msgid "Subject of the sent warning email"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:105
+msgid "Content"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:105
+msgid "Content of the sent email"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:109
+msgid "Signature"
+msgstr ""
+
+#: 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:115
+msgid "LDAP message support"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:118
+msgid "LDAP server"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:118
+msgid "The LDAP server to bind to"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:122
+msgid "Bind user dn"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:122
+msgid "The user dn to use for bind"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:126
+msgid "Bind user password"
+msgstr ""
+
+#: 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:159
+msgid "Warning"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:159
+#, php-format
+msgid "Invalid value in encodings : %s"
+msgstr ""
+
+#: admin/systems/services/quota/class_serviceQuota.inc:176
+#, php-format
+msgid "(%s by %s)"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:101
+msgid "Quota"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:102
+msgid "Plugin for quota support"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:120
+msgid "Quota information"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:125
+msgid "Quota information for this user"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:129
+msgid "Device this quota is for"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Block soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:133
+msgid "Soft limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:142
+msgid "Block hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:142
+msgid "Hard limit for the block the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Inode soft limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:151
+msgid "Soft limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:160
+msgid "Inode hard limit"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:160
+msgid "Hard limit for the inodes the user can use"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:169
+msgid "Server"
+msgstr ""
+
+#: personal/quota/class_quotaAccount.inc:169
+msgid "Server hosting the device this quota is for"
+msgstr ""
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
index 914dbc646304cedef9fdd2f40d58543276dc1b08..1a25b465ad654262078aeb3ec8adc9fe284e8f81 100644
Binary files a/renater-partage/html/themes/breezy/icons/16/apps/renater-partage.png and b/renater-partage/html/themes/breezy/icons/16/apps/renater-partage.png differ
diff --git a/renater-partage/html/themes/breezy/svg/16/apps/renater-partage.svg b/renater-partage/html/themes/breezy/svg/16/apps/renater-partage.svg
new file mode 100644
index 0000000000000000000000000000000000000000..5b0db9c7bd93c21400a8f81390c1aaa70e0b8bc2
--- /dev/null
+++ b/renater-partage/html/themes/breezy/svg/16/apps/renater-partage.svg
@@ -0,0 +1,238 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg64"
+   xml:space="preserve"
+   width="555.55603"
+   height="165.33333"
+   viewBox="0 0 555.55603 165.33333"
+   sodipodi:docname="renater-partage.svg"
+   inkscape:version="0.92.1 r15371"><metadata
+     id="metadata70"><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></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs68"><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath80"><path
+         d="M 0,124 H 416.667 V 0 H 0 Z"
+         id="path78"
+         inkscape:connector-curvature="0" /></clipPath></defs><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1600"
+     inkscape:window-height="840"
+     id="namedview66"
+     showgrid="false"
+     inkscape:zoom="2.5199978"
+     inkscape:cx="277.77802"
+     inkscape:cy="82.666664"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g72" /><g
+     id="g72"
+     inkscape:groupmode="layer"
+     inkscape:label="Partage-B"
+     transform="matrix(1.3333333,0,0,-1.3333333,0,165.33333)"><g
+       id="g74"
+       transform="translate(22.916687,-6.8452441)"><g
+         id="g76"
+         clip-path="url(#clipPath80)"><g
+           id="g82"
+           transform="translate(41.2303,75.4707)" /><g
+           id="g86"
+           transform="translate(93.7327,36.7061)" /><g
+           id="g90"
+           transform="translate(95.4353,68.4023)"><path
+             d="m 0,0 c 0,-5.466 -1.978,-10.449 -5.222,-14.267 l 3.394,-16.808 c 9.59,7.226 15.824,18.877 15.824,32.031 0,18.955 -12.934,34.792 -30.227,38.746 L -12.133,19.63 C -4.969,16.151 0,8.681 0,0"
+             style="fill:#b247ab;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path92"
+             inkscape:connector-curvature="0" /></g><g
+           id="g94"
+           transform="translate(90.096,53.9951)"><path
+             d="m 0,0 c -2.752,-3.185 -6.394,-5.536 -10.533,-6.629 l 14.128,-10.454 -0.084,0.415 c -0.032,-0.023 -0.062,-0.05 -0.093,-0.074 z"
+             style="fill:#3dbeeb;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path96"
+             inkscape:connector-curvature="0" /></g><g
+           id="g98"
+           transform="translate(53.1365,66.9209)"><g
+             id="g372"><path
+               inkscape:connector-curvature="0"
+               id="path84"
+               style="fill:#a2b501;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="m 0,0 c -0.581,-2.737 -0.903,-5.574 -0.903,-8.491 0,-11.721 4.947,-22.253 12.809,-29.522 v 29.222 z"
+               transform="translate(-11.9062,8.5497996)" /><path
+               inkscape:connector-curvature="0"
+               id="path88"
+               style="fill:#a2b501;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="m 0,0 -14.361,10.604 v -10e-4 l -4.993,3.686 -11.926,8.807 V -5.625 c 5.013,-2.44 10.615,-3.811 16.532,-3.811 7.321,0 14.166,2.092 20.001,5.723 l -5.295,3.919 z"
+               transform="translate(40.5962,-30.214797)" /><path
+               inkscape:connector-curvature="0"
+               id="path100"
+               style="fill:#3dbeeb;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="m 0,0 v 1.481 c 0,11.998 9.469,21.726 21.149,21.726 3.162,0 6.151,-0.732 8.844,-2.01 l -4.089,20.031 c 0.055,-0.012 0.109,-0.032 0.164,-0.044 l -0.804,3.939 c -2.665,0.597 -5.428,0.92 -8.266,0.92 -18.433,0 -33.841,-13.256 -37.711,-30.99 l 8.807,-6.503 c 0.016,0.076 0.027,0.153 0.044,0.228 z" /></g></g><g
+           id="g102"
+           transform="translate(64.3069,58.6553)"><path
+             d="M 0,0 -1.854,1.373 V 1.146 L 10.072,-7.66 -1.158,0.634 C -0.773,0.395 -0.386,0.203 0,0"
+             style="fill:#3dbeeb;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path104"
+             inkscape:connector-curvature="0" /></g><g
+           id="g106"
+           transform="translate(79.3719,47.3096)"><path
+             d="M 0,0 14.361,-10.604 14.319,-10.397 0.191,0.057 C 0.126,0.04 0.065,0.016 0,0"
+             style="fill:#3dbeeb;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path108"
+             inkscape:connector-curvature="0" /></g><g
+           id="g110"
+           transform="translate(53.1365,66.9209)"><path
+             d="M 0,0 -11.862,8.778 C -11.879,8.703 -11.89,8.626 -11.906,8.55 L 0,-0.241 Z"
+             style="fill:#3dbeeb;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path112"
+             inkscape:connector-curvature="0" /></g><g
+           id="g114"
+           transform="translate(83.1297,88.1182)"><path
+             d="m 0,0 c 0.058,-0.027 0.114,-0.058 0.172,-0.086 l -4.097,20.072 c -0.055,0.013 -0.109,0.033 -0.164,0.044 z"
+             style="fill:#3dbeeb;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path116"
+             inkscape:connector-curvature="0" /></g><g
+           id="g118"
+           transform="translate(90.096,53.9951)"><path
+             d="m 0,0 3.418,-16.742 c 0.031,0.024 0.061,0.051 0.093,0.074 L 0.118,0.141 C 0.079,0.094 0.04,0.046 0,0"
+             style="fill:#3dbeeb;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path120"
+             inkscape:connector-curvature="0" /></g><g
+           id="g122"
+           transform="translate(79.3714,47.3086)"><path
+             d="M 0,0 V 0.001 L -4.992,3.687 Z"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path124"
+             inkscape:connector-curvature="0" /></g><g
+           id="g126"
+           transform="translate(82.0633,64.4473)"><path
+             d="m 0,0 c -0.454,-0.421 -1.457,-0.688 -1.708,-0.687 -0.335,-0.663 -1.207,-0.892 -2.078,-0.943 -0.839,-0.049 -1.595,0.315 -2.016,0.896 -0.156,-0.067 -0.326,-0.107 -0.506,-0.118 -0.421,-0.024 -0.874,0.123 -1.184,0.42 h -0.416 c -0.232,-0.589 -0.888,-0.898 -1.484,-0.863 -0.179,0.011 -0.349,0.052 -0.506,0.117 -0.421,-0.581 -1.177,-0.944 -2.016,-0.895 -1.051,0.061 -1.895,0.751 -2.09,1.627 -0.124,0.004 -0.247,0.009 -0.37,0.014 -0.006,0.001 -0.013,0.001 -0.019,0.002 -3.176,0.191 -2.363,5.159 0.768,4.935 -0.111,1.621 1.352,2.503 2.646,2.427 0.303,-0.018 0.59,-0.086 0.854,-0.197 0.711,0.98 1.987,1.594 3.404,1.511 1.882,-0.109 3.373,-1.412 3.578,-3.018 0.194,0.025 0.394,0.033 0.597,0.021 C -0.987,5.158 0.666,3.914 0.808,2.405 0.831,2.298 0.847,2.188 0.853,2.075 0.87,1.783 0.818,1.502 0.711,1.249 0.585,0.764 0.351,0.326 0,0 m -7.777,16.111 c -6.536,0 -11.834,-5.443 -11.834,-12.156 v -8.374 l 1.855,-1.373 c 4.456,-2.344 8.843,-2.409 9.979,-2.409 6.535,0 11.834,5.442 11.834,12.156 0,6.713 -5.299,12.156 -11.834,12.156"
+             style="fill:#3dbeeb;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path128"
+             inkscape:connector-curvature="0" /></g><g
+           id="g130"
+           transform="translate(129.5818,33.1133)" /><g
+           id="g134"
+           transform="translate(133.7957,31.9639)" /><g
+           id="g138"
+           transform="translate(145.2639,39.9209)" /><g
+           id="g142"
+           transform="translate(150.7454,38.7832)" /><g
+           id="g146"
+           transform="translate(152.8313,36.0059)" /><g
+           id="g150"
+           transform="translate(163.0999,38.0098)" /><g
+           id="g154"
+           transform="translate(165.825,31.9639)" /><g
+           id="g158"
+           transform="translate(172.762,31.9639)" /><g
+           id="g162"
+           transform="translate(180.576,33.1133)" /><g
+           id="g166"
+           transform="translate(186.2024,31.9639)" /><g
+           id="g170"
+           transform="translate(194.1873,33.1133)" /><g
+           id="g174"
+           transform="translate(198.4012,31.9639)" /><g
+           id="g178"
+           transform="translate(206.1575,31.9307)" /><g
+           id="g182"
+           transform="translate(217.116,33.1133)" /><g
+           id="g188"
+           transform="translate(229.1756,38.0098)" /><g
+           id="g192"
+           transform="translate(232.0506,34.3555)" /><g
+           id="g196"
+           transform="translate(239.7937,31.9307)" /><g
+           id="g200"
+           transform="translate(247.8582,38.7832)" /><g
+           id="g204"
+           transform="translate(249.5789,33.1133)" /><g
+           id="g208"
+           transform="translate(258.0506,37.873)" /><g
+           id="g212"
+           transform="translate(265.0125,38.7832)" /><g
+           id="g216"
+           transform="translate(278.0183,38.0098)" /><g
+           id="g220"
+           transform="translate(281.95,33.1133)" /><g
+           id="g224"
+           transform="translate(287.3953,33.1133)" /><g
+           id="g228"
+           transform="translate(293.8299,35.3906)" /><g
+           id="g232"
+           transform="translate(299.7078,33.0801)" /><g
+           id="g236"
+           transform="translate(310.8797,38.0098)" /><g
+           id="g240"
+           transform="translate(315.1765,36.0059)" /><g
+           id="g244"
+           transform="translate(321.9754,35.3906)" /><g
+           id="g248"
+           transform="translate(327.7742,31.9307)" /><g
+           id="g252"
+           transform="translate(335.8377,38.7832)" /><g
+           id="g256"
+           transform="translate(337.4568,31.9639)" /><g
+           id="g260"
+           transform="translate(345.7029,37.873)" /><g
+           id="g264"
+           transform="translate(143.4763,65.1826)" /><g
+           id="g268"
+           transform="translate(143.4763,65.1826)" /><g
+           id="g272"
+           transform="translate(166.5711,63.252)" /><g
+           id="g276"
+           transform="translate(166.5711,63.252)" /><g
+           id="g280"
+           transform="translate(205.5965,47.6943)" /><g
+           id="g284"
+           transform="translate(205.5965,47.6943)" /><g
+           id="g288"
+           transform="translate(249.9734,47.6943)" /><g
+           id="g292"
+           transform="translate(249.9734,47.6943)" /><g
+           id="g296"
+           transform="translate(274.1883,63.252)" /><g
+           id="g300"
+           transform="translate(274.1883,63.252)" /><g
+           id="g304"
+           transform="translate(349.5535,78.1875)" /><g
+           id="g308"
+           transform="translate(349.5535,78.1875)" /><g
+           id="g312"
+           transform="translate(363.0701,48.626)" /><g
+           id="g316"
+           transform="translate(363.0701,48.626)" /><g
+           id="g320"
+           transform="translate(129.323,16.0996)" /><g
+           id="g324"
+           transform="translate(138.6253,21.9697)" /><g
+           id="g328"
+           transform="translate(142.8479,22.8838)" /><g
+           id="g332"
+           transform="translate(151.4226,18.1924)" /><g
+           id="g338"
+           transform="translate(166.7024,18.1924)" /><g
+           id="g342"
+           transform="translate(179.0335,21.2305)" /><g
+           id="g350"
+           transform="translate(198.2078,18.1924)" /></g></g></g></svg>
\ No newline at end of file
diff --git a/renater-partage/locale/af_ZA/fusiondirectory.po b/renater-partage/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..db96f1993793bd74d5f18185292cbc006ae0a787
--- /dev/null
+++ b/renater-partage/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,279 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+msgid "Partage"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+msgid "Information"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+msgid "Display name"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+msgid "Name to display for this group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+msgid "Hide from global catalog"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+msgid "Whether this group should be hidden from the global catalog"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+msgid "Notes"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+msgid "Notes about this group"
+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 ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
+msgid "Server did not return auth token"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+msgid "Partage API answer malformated"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:130
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:132
+msgid "Partage API Auth failed with no error message"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:141
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:143
+#, php-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:238
+msgid "Warning"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:238
+#, 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:470
+msgid "PARTAGE error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:471
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:510
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:523
+msgid "An account with the same email address already exists in Partage"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:588
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:625
+msgid "Never"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:632
+msgid "Last login"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:633
+msgid "Account status"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:633
+msgid "Unknown"
+msgstr ""
diff --git a/renater-partage/locale/ar/fusiondirectory.po b/renater-partage/locale/ar/fusiondirectory.po
index 1d4361ff0dcdd8d51de8d97a552f3971a8bdfe7c..0fd28255716c846a69e7f6211bc6d7bb6f12bf8b 100644
--- a/renater-partage/locale/ar/fusiondirectory.po
+++ b/renater-partage/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/renater-partage/locale/ca/fusiondirectory.po b/renater-partage/locale/ca/fusiondirectory.po
index d5aa52dca4adc52e2d8db1eb8884588428e0da0c..3eddaa082837ecd438f11f5523f42ba8bf44fe32 100644
--- a/renater-partage/locale/ca/fusiondirectory.po
+++ b/renater-partage/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/renater-partage/locale/cs_CZ/fusiondirectory.po b/renater-partage/locale/cs_CZ/fusiondirectory.po
index 26808f54b853c0825570c7d67541990e895663e3..cc656ea51ecaff7ac152a6c05d1cc004233c64e9 100644
--- a/renater-partage/locale/cs_CZ/fusiondirectory.po
+++ b/renater-partage/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/groups/renater-partage/class_partageGroup.inc:29
 #: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
diff --git a/renater-partage/locale/de/fusiondirectory.po b/renater-partage/locale/de/fusiondirectory.po
index b2b2fe98ac119c5e9cd9b0424c054da1de24451d..12595c48fcad2720e53a5ea69822b2521bd3df1e 100644
--- a/renater-partage/locale/de/fusiondirectory.po
+++ b/renater-partage/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/renater-partage/locale/el_GR/fusiondirectory.po b/renater-partage/locale/el_GR/fusiondirectory.po
index 076b00f4513c15be94f47296e37c3617254d7e8e..fb9839e5903a9f2ce06f742cadc1afeb71ba6f09 100644
--- a/renater-partage/locale/el_GR/fusiondirectory.po
+++ b/renater-partage/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/renater-partage/locale/es/fusiondirectory.po b/renater-partage/locale/es/fusiondirectory.po
index e5798de02ffe5c06826e6d45e445590ed0170d0e..cb6bf286838e9e7eff6edc99cca1946ba0d42cf1 100644
--- a/renater-partage/locale/es/fusiondirectory.po
+++ b/renater-partage/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/renater-partage/locale/es_CO/fusiondirectory.po b/renater-partage/locale/es_CO/fusiondirectory.po
index beb28d1873e34ca3e4ae90d2c064a7a016b2e10f..7688fd36ccd4e0d3b83328cfb73d78aef0d48dbd 100644
--- a/renater-partage/locale/es_CO/fusiondirectory.po
+++ b/renater-partage/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/renater-partage/locale/es_VE/fusiondirectory.po b/renater-partage/locale/es_VE/fusiondirectory.po
index e1acaad16cffa445ee1a36d0eeba6a2c51728d9f..4a53bf45f70a9ab2875cda4f9ef502412a38a94c 100644
--- a/renater-partage/locale/es_VE/fusiondirectory.po
+++ b/renater-partage/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/renater-partage/locale/fa_IR/fusiondirectory.po b/renater-partage/locale/fa_IR/fusiondirectory.po
index 76f5a6969cc1d4b4930f26149bb16a34420586fb..960fb584ec5110e859af1e2b59b2e4c96d93aba7 100644
--- a/renater-partage/locale/fa_IR/fusiondirectory.po
+++ b/renater-partage/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/groups/renater-partage/class_partageGroup.inc:29
 #: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
diff --git a/renater-partage/locale/fi_FI/fusiondirectory.po b/renater-partage/locale/fi_FI/fusiondirectory.po
index d1c6279e3e28ff30a10ee371e06fc45f6ce87526..f049a64ef3652138ad94ebd5eb66977f3d865ec2 100644
--- a/renater-partage/locale/fi_FI/fusiondirectory.po
+++ b/renater-partage/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/renater-partage/locale/fr/fusiondirectory.po b/renater-partage/locale/fr/fusiondirectory.po
index 5a23c2ff874a2c0d309a53f126567b67f41df867..357a50af8835bf5b9e6e828a28d3954aa8727717 100644
--- a/renater-partage/locale/fr/fusiondirectory.po
+++ b/renater-partage/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/renater-partage/locale/hu_HU/fusiondirectory.po b/renater-partage/locale/hu_HU/fusiondirectory.po
index 3965b24ab7cde1173ef2391dc443d8ec580a0f0d..300703d421bcf3ee33bef1bffecf52a68b2e0356 100644
--- a/renater-partage/locale/hu_HU/fusiondirectory.po
+++ b/renater-partage/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/renater-partage/locale/id/fusiondirectory.po b/renater-partage/locale/id/fusiondirectory.po
index e9e00253845ba767408c3357eb62a61bddf8a730..cd8b4c6d304096184bad36ed49e16ab771265811 100644
--- a/renater-partage/locale/id/fusiondirectory.po
+++ b/renater-partage/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/renater-partage/locale/it_IT/fusiondirectory.po b/renater-partage/locale/it_IT/fusiondirectory.po
index 1524953cc930457a8c074860c509e0b17d30ddbf..b4d6a8f8c57e3355061435dae1598fadd8bd15e5 100644
--- a/renater-partage/locale/it_IT/fusiondirectory.po
+++ b/renater-partage/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/renater-partage/locale/ja/fusiondirectory.po b/renater-partage/locale/ja/fusiondirectory.po
index cd444710161fa0858ccc18d5962c164242dd7ddb..f09840fa8232d568001fd70035d158936c24c3d5 100644
--- a/renater-partage/locale/ja/fusiondirectory.po
+++ b/renater-partage/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/renater-partage/locale/ko/fusiondirectory.po b/renater-partage/locale/ko/fusiondirectory.po
index f83093c96aacc94f8faa7869f697757d2758c87c..377b1cee5112949ae450c1f5ba72e3a120154b50 100644
--- a/renater-partage/locale/ko/fusiondirectory.po
+++ b/renater-partage/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/renater-partage/locale/lv/fusiondirectory.po b/renater-partage/locale/lv/fusiondirectory.po
index 3534450342291aa8d88277ac3d9c406f4056236c..ad737a4aa37f46ecf0cbd0f0e185d6fa6070a02a 100644
--- a/renater-partage/locale/lv/fusiondirectory.po
+++ b/renater-partage/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/renater-partage/locale/nb/fusiondirectory.po b/renater-partage/locale/nb/fusiondirectory.po
index 68f77c9f89ada5ba172621030e1dc7ff3cfb1dc3..2288087b2450ad3856f608689c557e1170120690 100644
--- a/renater-partage/locale/nb/fusiondirectory.po
+++ b/renater-partage/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/renater-partage/locale/nl/fusiondirectory.po b/renater-partage/locale/nl/fusiondirectory.po
index 4770de531852f610703c4716b3b245de37292df8..079346129c6c9274f9fc1b2257334094a8787d7f 100644
--- a/renater-partage/locale/nl/fusiondirectory.po
+++ b/renater-partage/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Rombout de Neef <rombout.deneef@digipolis.be>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/renater-partage/locale/pl/fusiondirectory.po b/renater-partage/locale/pl/fusiondirectory.po
index 08b81bfa399af1a4fa868d6d94a60f9f0b31d774..520f9707d7fbf28bf1941a478f804856fa615f1a 100644
--- a/renater-partage/locale/pl/fusiondirectory.po
+++ b/renater-partage/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/renater-partage/locale/pt/fusiondirectory.po b/renater-partage/locale/pt/fusiondirectory.po
index c4ddb868bade5de6a245f1a6a54b0a70bda01f34..6276f132482ffcf2a510d2fbc09e28aedd918174 100644
--- a/renater-partage/locale/pt/fusiondirectory.po
+++ b/renater-partage/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/renater-partage/locale/pt_BR/fusiondirectory.po b/renater-partage/locale/pt_BR/fusiondirectory.po
index 41be2715911c9d2ac1d8be9203214ff642ad4dd8..570c8f1e0251e42b6fbf982c8e02b4a6bb43f44f 100644
--- a/renater-partage/locale/pt_BR/fusiondirectory.po
+++ b/renater-partage/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/renater-partage/locale/ru/fusiondirectory.po b/renater-partage/locale/ru/fusiondirectory.po
index 1554d22bef8bd919186b32c839e7b35e1f61a5dc..2fcf7e9781ac86c450a13a2cd2152320c5316707 100644
--- a/renater-partage/locale/ru/fusiondirectory.po
+++ b/renater-partage/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/renater-partage/locale/ru@petr1708/fusiondirectory.po b/renater-partage/locale/ru@petr1708/fusiondirectory.po
index aea18d8abe85a724f1c1a212ff031a4e9440588c..68936c8a876081a02e6c9022f8d017a9eea4d4ce 100644
--- a/renater-partage/locale/ru@petr1708/fusiondirectory.po
+++ b/renater-partage/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/renater-partage/locale/sv/fusiondirectory.po b/renater-partage/locale/sv/fusiondirectory.po
index d3821554f7b4ee5bd6222ceafb94d4b14b9534c7..abc6dd17fc1e12fd3fda890aaf37362286ae7aa4 100644
--- a/renater-partage/locale/sv/fusiondirectory.po
+++ b/renater-partage/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/renater-partage/locale/tr_TR/fusiondirectory.po b/renater-partage/locale/tr_TR/fusiondirectory.po
index 3aa9d5e9a552bd96aee1e5839eaaeed5fbef154b..a22c316811329ab2c1139aa485fc7e9f852bad73 100644
--- a/renater-partage/locale/tr_TR/fusiondirectory.po
+++ b/renater-partage/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/renater-partage/locale/ug/fusiondirectory.po b/renater-partage/locale/ug/fusiondirectory.po
index f969503de930a7c33aba50eaeb3fad5e899cdafd..af035ad2c44100e6e9959bed6be2b2731aacf35b 100644
--- a/renater-partage/locale/ug/fusiondirectory.po
+++ b/renater-partage/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/renater-partage/locale/vi_VN/fusiondirectory.po b/renater-partage/locale/vi_VN/fusiondirectory.po
index 51e86ceeb4123d9ebdece64cb76251f5e2e52661..2e27dc44c2a76b50c2b6a6709163023380937e1b 100644
--- a/renater-partage/locale/vi_VN/fusiondirectory.po
+++ b/renater-partage/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/renater-partage/locale/zh/fusiondirectory.po b/renater-partage/locale/zh/fusiondirectory.po
index 8360780994fe37fcde56d937f459c1f3964b67ef..a4aa7e08ad332de03873fa27bd84f06e929059e0 100644
--- a/renater-partage/locale/zh/fusiondirectory.po
+++ b/renater-partage/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/renater-partage/locale/zh_TW/fusiondirectory.po b/renater-partage/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..d4e4b8308a65cab61988ca476445f973ef29d52a
--- /dev/null
+++ b/renater-partage/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,279 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/groups/renater-partage/class_partageGroup.inc:29
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:29
+msgid "Partage"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:30
+msgid "Partage group options"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:41
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:40
+msgid "Information"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+msgid "Display name"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:44
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:48
+msgid "Name to display for this group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+msgid "Hide from global catalog"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:48
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:52
+msgid "Whether this group should be hidden from the global catalog"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:53
+msgid "Type of PARTAGE group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Distribution list"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:56
+msgid "Group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Alert new members"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:59
+msgid "Send a message to alert new members, they have joined this group"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+msgid "Notes"
+msgstr ""
+
+#: admin/groups/renater-partage/class_partageGroup.inc:64
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:65
+msgid "Notes about this group"
+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 ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:30
+msgid "Partage sympa options"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:43
+msgid "Email server"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative addresses"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:70
+msgid "Alternative mail addresses for the list"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:158
+#, php-format
+msgid "Mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:161
+#, php-format
+msgid "Cannot update mailbox: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+msgid "Mail error"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:182
+#, php-format
+msgid "Cannot remove mailbox, mail method cannot connect: %s"
+msgstr ""
+
+#: admin/sympa/renater-partage/class_sympaAliasPartage.inc:186
+#, php-format
+msgid "Cannot remove mailbox: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:61
+msgid "Server did not return auth token"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+msgid "Partage API answer malformated"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:130
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:132
+msgid "Partage API Auth failed with no error message"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:141
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:143
+#, php-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:238
+msgid "Warning"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:238
+#, 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:470
+msgid "PARTAGE error"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:471
+#, php-format
+msgid "Several users have uid \"%s\". Ignoring this member."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:510
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:523
+msgid "An account with the same email address already exists in Partage"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:588
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:625
+msgid "Never"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:632
+msgid "Last login"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:633
+msgid "Account status"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:633
+msgid "Unknown"
+msgstr ""
diff --git a/repository/locale/af_ZA/fusiondirectory.po b/repository/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..0f0b69e9981fdb30233c6ec49dc5f5138c937449
--- /dev/null
+++ b/repository/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,182 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
+msgid "Repository management"
+msgstr ""
+
+#: admin/repository/class_repositoryManagement.inc:34
+#: config/repository/class_repositoryConfig.inc:42
+msgid "Repository"
+msgstr ""
+
+#: 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 ""
+
+#: admin/repository/class_buildRepository.inc:63
+#: admin/repository/class_repositoryDistribution.inc:60
+#: admin/repository/class_repositorySection.inc:57
+msgid "Name"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:63
+msgid "Unique name for this repository"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:67
+#: admin/repository/class_repositoryDistribution.inc:64
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:67
+msgid "Description of this repository"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:72
+msgid "Distribution sections"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:72
+msgid "The distribution sections this repository provides"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:78
+msgid "Private"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:78
+msgid "Is this repository private or public?"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:82
+msgid "Type"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:82
+msgid "Repository type"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:89
+msgid "Members"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:92
+msgid "Admins"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:92
+msgid "Admins of this repository"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:96
+msgid "Uploaders"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:96
+msgid "Uploaders of this repository"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:100
+msgid "Users"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:100
+msgid "Users of this repository"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:30
+#: admin/repository/class_repositoryDistribution.inc:31
+#: admin/repository/class_repositoryDistribution.inc:33
+#: admin/repository/class_repositoryDistribution.inc:56
+msgid "Repository distribution"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:30
+#: admin/repository/class_repositorySection.inc:31
+#: admin/repository/class_repositorySection.inc:33
+#: admin/repository/class_repositorySection.inc:53
+msgid "Repository section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
+msgstr ""
+
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
+msgstr ""
+
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
+msgstr ""
+
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
+msgstr ""
+
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
+msgstr ""
+
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
+msgstr ""
+
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
+msgstr ""
diff --git a/repository/locale/ar/fusiondirectory.po b/repository/locale/ar/fusiondirectory.po
index 074308eea2d4c32701a72b22b4872462369aee0d..558ab8af4bedaec23ce0354a23e8436e9dd6752e 100644
--- a/repository/locale/ar/fusiondirectory.po
+++ b/repository/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/repository/locale/ca/fusiondirectory.po b/repository/locale/ca/fusiondirectory.po
index 4c7596c7067f28899755a1bc6535f4e46b47ca4e..8bf82324ea9770b453182c7b26bd90e9ea6a8566 100644
--- a/repository/locale/ca/fusiondirectory.po
+++ b/repository/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/repository/locale/cs_CZ/fusiondirectory.po b/repository/locale/cs_CZ/fusiondirectory.po
index 5875b03feb4ab15e8270b7a285ecdc97f9809774..ff0cd17d27680492ae712d535d2457f2dfc8d632 100644
--- a/repository/locale/cs_CZ/fusiondirectory.po
+++ b/repository/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/repository/class_repositoryManagement.inc:28
 #: admin/repository/class_repositoryManagement.inc:29
diff --git a/repository/locale/de/fusiondirectory.po b/repository/locale/de/fusiondirectory.po
index 91cb9ef61b34bc99d4acff7b8ac088277b082907..51089573956f5642357b887c6b678f61130f8574 100644
--- a/repository/locale/de/fusiondirectory.po
+++ b/repository/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/repository/locale/el_GR/fusiondirectory.po b/repository/locale/el_GR/fusiondirectory.po
index 7eb75090711682ccf9e2cb288157ac8dd987bc1b..1a991b5fce03258bf383e82b6db052f26edf3c9b 100644
--- a/repository/locale/el_GR/fusiondirectory.po
+++ b/repository/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/repository/locale/es/fusiondirectory.po b/repository/locale/es/fusiondirectory.po
index b937bd1b639fe18f5d2eae572368fd8cdfdeb53f..cb37ea1af915a95bb60c444608a8c741ed105b43 100644
--- a/repository/locale/es/fusiondirectory.po
+++ b/repository/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/repository/locale/es_CO/fusiondirectory.po b/repository/locale/es_CO/fusiondirectory.po
index f6a3e193cd4a4864f6fc1e6f75ba8f5655544c82..cc427bdddea250f4a4724be4e61d625fcf9f62d8 100644
--- a/repository/locale/es_CO/fusiondirectory.po
+++ b/repository/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/repository/locale/es_VE/fusiondirectory.po b/repository/locale/es_VE/fusiondirectory.po
index 04777eb69e483b219e757aa345e9ac65f679d79b..3a6c0d1a1a4da02027ed53af589824bfdbdfbcc6 100644
--- a/repository/locale/es_VE/fusiondirectory.po
+++ b/repository/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/repository/locale/fa_IR/fusiondirectory.po b/repository/locale/fa_IR/fusiondirectory.po
index e7c4ad968b4062cb7f23ac0316f639a120d46b35..a43a3e65dd7826f259deb017d93fa138aaf7086b 100644
--- a/repository/locale/fa_IR/fusiondirectory.po
+++ b/repository/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa_IR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/repository/class_repositoryManagement.inc:28
 #: admin/repository/class_repositoryManagement.inc:29
diff --git a/repository/locale/fi_FI/fusiondirectory.po b/repository/locale/fi_FI/fusiondirectory.po
index f5ade51977535faced9f9293f67f6c79d715e052..fdf62bc85cc0a57abc978c9932ea6c2988421549 100644
--- a/repository/locale/fi_FI/fusiondirectory.po
+++ b/repository/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/repository/locale/fr/fusiondirectory.po b/repository/locale/fr/fusiondirectory.po
index 0735c339439624930564cf4fc689968f3cc4b763..bf5fb712dfa124080a960bfc486c47ff83bd890f 100644
--- a/repository/locale/fr/fusiondirectory.po
+++ b/repository/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/repository/locale/hu_HU/fusiondirectory.po b/repository/locale/hu_HU/fusiondirectory.po
index 19475f260a16f1234479b43462916cfe6deb97af..cc2e8b80c2767adb098c65912b9016b2cd83760b 100644
--- a/repository/locale/hu_HU/fusiondirectory.po
+++ b/repository/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/repository/locale/id/fusiondirectory.po b/repository/locale/id/fusiondirectory.po
index 61672d18a6be84dee106070bfef4d6f80aaafc55..7f4f0825857c18bda0137df411214192721e39a9 100644
--- a/repository/locale/id/fusiondirectory.po
+++ b/repository/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/repository/locale/it_IT/fusiondirectory.po b/repository/locale/it_IT/fusiondirectory.po
index 537481f9e14d6a29efb520b95d0d3a9c2fcfa314..bd768eb498a6967c4876a67d39425e93655a207a 100644
--- a/repository/locale/it_IT/fusiondirectory.po
+++ b/repository/locale/it_IT/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +26,7 @@ msgstr "Gestione di Repository"
 #: admin/repository/class_repositoryManagement.inc:34
 #: config/repository/class_repositoryConfig.inc:42
 msgid "Repository"
-msgstr "Deposito"
+msgstr "Repository"
 
 #: admin/repository/class_buildRepository.inc:30
 #: admin/repository/class_buildRepository.inc:31
diff --git a/repository/locale/ja/fusiondirectory.po b/repository/locale/ja/fusiondirectory.po
index 4f297d8d290a2d8438ce31f1d55721bc090328ff..cf91d4cc1d55f4f0d42b631e67b849bbf6b129b9 100644
--- a/repository/locale/ja/fusiondirectory.po
+++ b/repository/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/repository/locale/ko/fusiondirectory.po b/repository/locale/ko/fusiondirectory.po
index 94c8ceaf5a6fa3e3332b6c47ab73d6f5eefb0740..f44677a98a455c05b25d4bb8be6ab4973fb6c9b1 100644
--- a/repository/locale/ko/fusiondirectory.po
+++ b/repository/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/repository/locale/lv/fusiondirectory.po b/repository/locale/lv/fusiondirectory.po
index 702a1d41991951af4993823da258648b24da5a52..ae2255def36aeb0d7df1fa9350881ba2eb45f52b 100644
--- a/repository/locale/lv/fusiondirectory.po
+++ b/repository/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/repository/locale/nb/fusiondirectory.po b/repository/locale/nb/fusiondirectory.po
index 95e13c226992a03d7ab5f02d7d84db8157d944c5..6ae983fe2eb893fe02bf26b2873649bacc99e527 100644
--- a/repository/locale/nb/fusiondirectory.po
+++ b/repository/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/repository/locale/nl/fusiondirectory.po b/repository/locale/nl/fusiondirectory.po
index d86d8ee6ced40d145901e1836f3cba6256fd2059..c1402510da7ab7717689f8eaf12ba1544d44fe7f 100644
--- a/repository/locale/nl/fusiondirectory.po
+++ b/repository/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/repository/locale/pl/fusiondirectory.po b/repository/locale/pl/fusiondirectory.po
index cb3fe22a05596edbdde04918dc8386158675a3a9..cdfe293c823d4b956a748613f9af3f35e802915e 100644
--- a/repository/locale/pl/fusiondirectory.po
+++ b/repository/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/repository/locale/pt/fusiondirectory.po b/repository/locale/pt/fusiondirectory.po
index 1462cd7d4e5f3b44199982b8001d2110fbfe2cd7..170b9c8fa2f7ad9ec851b356b14a6665200ecca4 100644
--- a/repository/locale/pt/fusiondirectory.po
+++ b/repository/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/repository/locale/pt_BR/fusiondirectory.po b/repository/locale/pt_BR/fusiondirectory.po
index 98878c24d247fd7ffa5cc9f9e4752488bca2cdbb..420ea9bccbf2873850448c2126fb3ee14d9dff39 100644
--- a/repository/locale/pt_BR/fusiondirectory.po
+++ b/repository/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/repository/locale/ru/fusiondirectory.po b/repository/locale/ru/fusiondirectory.po
index da0519db620c643b5e1d6eedeea77c48b101b5c9..8e1e29d504ade9177b349fc079efe242ca43c2af 100644
--- a/repository/locale/ru/fusiondirectory.po
+++ b/repository/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/repository/locale/ru@petr1708/fusiondirectory.po b/repository/locale/ru@petr1708/fusiondirectory.po
index 7cc6c9db16c886338fbb248ac31679e5f4cdad02..2ff0b842e00c8ce93564d0dbf8fbd118b8354ddf 100644
--- a/repository/locale/ru@petr1708/fusiondirectory.po
+++ b/repository/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/repository/locale/sv/fusiondirectory.po b/repository/locale/sv/fusiondirectory.po
index 03b3dcfa99f23283412b53127ba014b6cd4b1988..5ef6c498dff1a0193eaa78b69b70612309c1bc2f 100644
--- a/repository/locale/sv/fusiondirectory.po
+++ b/repository/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/repository/locale/tr_TR/fusiondirectory.po b/repository/locale/tr_TR/fusiondirectory.po
index bbebf9d94f3391e336623bc11baaed3dcaee777e..3da3e9d97bd15ccd35a795f46c72a0caa2e3fde5 100644
--- a/repository/locale/tr_TR/fusiondirectory.po
+++ b/repository/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/repository/locale/ug/fusiondirectory.po b/repository/locale/ug/fusiondirectory.po
index c52cb0d18b9b57120432a593ea07c456d10bee73..d2d12f8dd565b9a4eb59c0abc73d9583b6cffe09 100644
--- a/repository/locale/ug/fusiondirectory.po
+++ b/repository/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/repository/locale/vi_VN/fusiondirectory.po b/repository/locale/vi_VN/fusiondirectory.po
index 088893617493fb429866f7077f35cdbe6b53377c..6ede7d195f201bf904d12374d038747364308f79 100644
--- a/repository/locale/vi_VN/fusiondirectory.po
+++ b/repository/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/repository/locale/zh/fusiondirectory.po b/repository/locale/zh/fusiondirectory.po
index c0a4b2b2768637567cef67f4db07fe4e0685e805..ba85acd8b2f4d450c56339b86d57a8060d22aaf4 100644
--- a/repository/locale/zh/fusiondirectory.po
+++ b/repository/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/repository/locale/zh_TW/fusiondirectory.po b/repository/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..904dd8ee08585c3b8dc32200086a043f61fdfd09
--- /dev/null
+++ b/repository/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,182 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
+msgid "Repository management"
+msgstr ""
+
+#: admin/repository/class_repositoryManagement.inc:34
+#: config/repository/class_repositoryConfig.inc:42
+msgid "Repository"
+msgstr ""
+
+#: 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 ""
+
+#: admin/repository/class_buildRepository.inc:63
+#: admin/repository/class_repositoryDistribution.inc:60
+#: admin/repository/class_repositorySection.inc:57
+msgid "Name"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:63
+msgid "Unique name for this repository"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:67
+#: admin/repository/class_repositoryDistribution.inc:64
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:67
+msgid "Description of this repository"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:72
+msgid "Distribution sections"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:72
+msgid "The distribution sections this repository provides"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:78
+msgid "Private"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:78
+msgid "Is this repository private or public?"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:82
+msgid "Type"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:82
+msgid "Repository type"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:89
+msgid "Members"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:92
+msgid "Admins"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:92
+msgid "Admins of this repository"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:96
+msgid "Uploaders"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:96
+msgid "Uploaders of this repository"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:100
+msgid "Users"
+msgstr ""
+
+#: admin/repository/class_buildRepository.inc:100
+msgid "Users of this repository"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:30
+#: admin/repository/class_repositoryDistribution.inc:31
+#: admin/repository/class_repositoryDistribution.inc:33
+#: admin/repository/class_repositoryDistribution.inc:56
+msgid "Repository distribution"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:60
+msgid "Unique name for this distribution"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:64
+msgid "Description of this distribution"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "Section"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:69
+msgid "The sections this distribution contains"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+#: admin/repository/class_repositorySection.inc:66
+msgid "Based on"
+msgstr ""
+
+#: admin/repository/class_repositoryDistribution.inc:76
+msgid "The distributions this one is based on"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:30
+#: admin/repository/class_repositorySection.inc:31
+#: admin/repository/class_repositorySection.inc:33
+#: admin/repository/class_repositorySection.inc:53
+msgid "Repository section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:57
+msgid "Unique name for this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:61
+msgid "Description of this section"
+msgstr ""
+
+#: admin/repository/class_repositorySection.inc:66
+msgid "The sections this one is based on"
+msgstr ""
+
+#: config/repository/class_repositoryConfig.inc:28
+msgid "Repository configuration"
+msgstr ""
+
+#: config/repository/class_repositoryConfig.inc:29
+msgid "FusionDirectory repository plugin configuration"
+msgstr ""
+
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Repository RDN"
+msgstr ""
+
+#: config/repository/class_repositoryConfig.inc:45
+msgid "Branch in which repository objects will be stored"
+msgstr ""
+
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Repository types"
+msgstr ""
+
+#: config/repository/class_repositoryConfig.inc:51
+msgid "Available repository types"
+msgstr ""
diff --git a/samba/admin/groups/samba/class_sambaGroup.inc b/samba/admin/groups/samba/class_sambaGroup.inc
index acd127df8cfb7a67a20ab4daab9007028139cd03..983b6551a4255543d21f815c5c3669186b636095 100644
--- a/samba/admin/groups/samba/class_sambaGroup.inc
+++ b/samba/admin/groups/samba/class_sambaGroup.inc
@@ -113,7 +113,7 @@ class sambaGroup extends simplePlugin
       $this->setGID(0);
     }
 
-    /* Don't loose special groups! If not key'ed above, add it to the combo box */
+    /* Don't lose special groups! If not key'ed above, add it to the combo box */
     if (!in_array($this->getGID(), $this->attributesAccess['sambaSID']->attributes[1]->getChoices())) {
       $this->attributesAccess['sambaSID']->attributes[1]->setChoices(
         array(0,                512,                513,                514,                $this->getGID()),
@@ -175,7 +175,8 @@ class sambaGroup extends simplePlugin
     parent::resetCopyInfos();
 
     /* Set a new SID */
-    $this->sambaSID = "";
+    $this->setSID('');
+    $this->attributesAccess['sambaDomainName']->setInitialValue('');
   }
 
   function getRidBase()
diff --git a/samba/locale/af_ZA/fusiondirectory.po b/samba/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..d3980509b70078b0ba191512a56d81e019bdd008
--- /dev/null
+++ b/samba/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,616 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: include/class_smbHash.inc:356
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
+msgstr ""
+
+#: admin/samba/class_sambaDomainManagement.inc:34
+msgid "Samba domains"
+msgstr ""
+
+#: 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 ""
+
+#: admin/samba/class_sambaDomain.inc:35
+msgid "Samba domain settings"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:51
+#: admin/systems/samba/class_sambaSystemTab.inc:44
+msgid "Properties"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Domain name"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Name of this domain"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID of this domain"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Rid base"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Algorithmic rid base"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:66
+msgid "Minimum password age"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:67
+msgid ""
+"Minimum password age, in seconds (default: 0 => allow immediate password "
+"change)"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:72
+msgid "Maximum password age"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:73
+msgid ""
+"Maximum password age, in seconds (default: -1 => never expire passwords)"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:78
+msgid "Next RID"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:79
+msgid "Next NT rid to give out for anything"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:83
+msgid "Next group RID"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:84
+msgid "Next NT rid to give out for groups"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:88
+msgid "Next user RID"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:89
+msgid "Next NT rid to give our for users"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:93
+msgid "Minimum password length"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:94
+msgid "Minimal password length (default: 5)"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:98
+msgid "Password history length"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:99
+msgid "Length of Password History Entries (default: 0 => off)"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:103
+msgid "Logon to change password"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:104
+msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:108
+msgid "Lockout duration"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:109
+msgid "Lockout duration in minutes (default: 30, -1 => forever)"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:113
+msgid "Lockout observation window"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:114
+msgid "Reset time after lockout in minutes (default: 30)"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:118
+msgid "Lockout threshold"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:119
+msgid "Lockout users after bad logon attempts (default: 0 => off)"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:123
+msgid "Force logoff"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:124
+msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:128
+msgid "Refuse machine password change"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:129
+msgid "Allow Machine Password changes (default: 0 => off)"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
+#: config/samba/class_sambaPluginConfig.inc:28
+#: personal/samba/class_sambaAccount.inc:158
+msgid "Samba"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_sambaSystemTab.inc:53
+#: personal/samba/class_sambaAccount.inc:199
+msgid "Domain"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba information"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain admins"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain users"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain guests"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Configuration error"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Cannot find group SID in your configuration!"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
+msgid "Warning"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:511
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr ""
+
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
+msgstr ""
+
+#: admin/systems/samba/class_sambaSystemTab.inc:31
+msgid "Windows workstation information"
+msgstr ""
+
+#: admin/systems/samba/class_sambaSystemTab.inc:53
+#: personal/samba/class_sambaAccount.inc:199
+msgid "Samba domain name"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:29
+msgid "Samba plugin configuration"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:41
+#: personal/samba/class_sambaAccount.inc:159
+msgid "Samba settings"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "Samba ID mapping"
+msgstr ""
+
+#: 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:49
+msgid "Samba SID"
+msgstr ""
+
+#: 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:55
+msgid "Samba rid base"
+msgstr ""
+
+#: 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:61
+msgid "Expiration date synchronisaton"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:61
+msgid "Synchronisaton the expiration date with the POSIX one?"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:67
+msgid "Generate sambaLMPassword"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:67
+msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:71
+msgid "Activate primary group warning"
+msgstr ""
+
+#: 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 ""
+
+#: personal/samba/class_sambaAccount.inc:31
+msgid "Samba Munged Dial"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:183
+msgid "Samba profile"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Home directory drive"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Letter for the home drive"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "Home directory path"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "UNC path for the home drive"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Script path"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Login script path"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "Profile path"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "UNC profile path"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:214
+msgid "Terminal server"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:218
+msgid "Allow login on terminal server"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client config"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client configuration"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Initial progam"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Program to start after connecting"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Working directory"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Basic working directory"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Connection timeout"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Timeout when connecting to terminal server"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Disconnection timeout"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Timeout before disconnecting from terminal server"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout before disconnecting from terminal server"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Connect client drives at logon"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Drive to connect after login"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Connect client printers at logon"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Printers to connect after login"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default to main client printer"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default printer for this client"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:276
+msgid "Shadowing"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:279
+msgid "disabled"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify on"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify off"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, notify on"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, nofify off"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:283
+msgid "On broken or timed out"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:283
+msgid "What happen if disconnected or timeout"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:286
+msgid "disconnect"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:286
+msgid "reset"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:289
+msgid "Reconnect if disconnected"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from any client"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from previous client only"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:304
+msgid "Access options"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Enforce password change"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Force the user to change his password"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password never expire"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password will never expire"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from windows client requires no password"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from a client without a password"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock samba account"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock the account"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Cannot change password"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Not allowed to change password"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:332
+msgid "Account expiration"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:332
+msgid "When does the account expire"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:340
+msgid "Samba logon times"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:340
+msgid "What is the allowed time to connect"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:341
+msgid "Edit settings"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:357
+msgid "System trust"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Allow connection from these workstations only"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Only allow this user to connect to this list of hosts"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:479
+#: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:494
+msgid "The windows user manager allows eight clients at maximum!"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:538
+msgid ""
+"Cannot convert primary group to samba group: group cannot be identified!"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:559
+msgid ""
+"Cannot convert primary group to samba group: group samba tab is disabled!"
+msgstr ""
+
+#: personal/samba/sambaLogonHours.tpl.c:2
+msgid "Specify the hours this user is allowed to log in"
+msgstr ""
+
+#: personal/samba/sambaLogonHours.tpl.c:5
+msgid "Hour"
+msgstr ""
diff --git a/samba/locale/ar/fusiondirectory.po b/samba/locale/ar/fusiondirectory.po
index a06f2a844dcfed87980d40b1703cd759b1286f88..1b8fd5c86b91ea3fe0c977b78fa042339a308511 100644
--- a/samba/locale/ar/fusiondirectory.po
+++ b/samba/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/samba/locale/ca/fusiondirectory.po b/samba/locale/ca/fusiondirectory.po
index 6a9e97f24527a2bd87e1633ca1ef35dd0ec6b0fa..ee926eb73416bbd5983ebfe3fa8a93094369bea9 100644
--- a/samba/locale/ca/fusiondirectory.po
+++ b/samba/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/samba/locale/cs_CZ/fusiondirectory.po b/samba/locale/cs_CZ/fusiondirectory.po
index 785950e51b7818af04651a54522cf1acb68dcbac..33b413613d226d5968f10819659709e3c1d9cd57 100644
--- a/samba/locale/cs_CZ/fusiondirectory.po
+++ b/samba/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: include/class_smbHash.inc:356
 msgid ""
diff --git a/samba/locale/de/fusiondirectory.po b/samba/locale/de/fusiondirectory.po
index e35db54ca13116a7684a7b84483d5ced0b361f1f..088c5a50f6732cfef1241ba9e66f40bb08fbc96d 100644
--- a/samba/locale/de/fusiondirectory.po
+++ b/samba/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/samba/locale/el_GR/fusiondirectory.po b/samba/locale/el_GR/fusiondirectory.po
index 39045d16ddc136448ee6a696e3d679b06ad8c58e..5c2df9848e33be68804f40ac985505af40e7adaa 100644
--- a/samba/locale/el_GR/fusiondirectory.po
+++ b/samba/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/samba/locale/es/fusiondirectory.po b/samba/locale/es/fusiondirectory.po
index 253b639c9da67683dccc8fa63897b550968fb300..b60e68550f1f028e7f6da1e5afa9e660d622c265 100644
--- a/samba/locale/es/fusiondirectory.po
+++ b/samba/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/samba/locale/es_CO/fusiondirectory.po b/samba/locale/es_CO/fusiondirectory.po
index 5bd3122780058ccc70caf463a8f32523b3f9b6e9..7722e6f2603cebff653e7be8ecf20f5705ed14b6 100644
--- a/samba/locale/es_CO/fusiondirectory.po
+++ b/samba/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/samba/locale/es_VE/fusiondirectory.po b/samba/locale/es_VE/fusiondirectory.po
index b95144661c15c767efa6b69fade71666e24e7c78..b78fa5e28829299a868b1c708291a4abfdcd53ff 100644
--- a/samba/locale/es_VE/fusiondirectory.po
+++ b/samba/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/samba/locale/fa_IR/fusiondirectory.po b/samba/locale/fa_IR/fusiondirectory.po
index 9564838e74e339095436c1622442b0672f8ce002..99a089c07e6498717157a7a2dcc4754c425787e6 100644
--- a/samba/locale/fa_IR/fusiondirectory.po
+++ b/samba/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: include/class_smbHash.inc:356
 msgid ""
diff --git a/samba/locale/fi_FI/fusiondirectory.po b/samba/locale/fi_FI/fusiondirectory.po
index d8eaec6a6eebd5c438c37b8beb69340b3969f108..5c8a94563273b5056fec27e7b39e78f0b360ff7d 100644
--- a/samba/locale/fi_FI/fusiondirectory.po
+++ b/samba/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/samba/locale/fr/fusiondirectory.po b/samba/locale/fr/fusiondirectory.po
index 01afabd703625c5213be2e50a0ec8867b6df8bb1..0af22550419e92043fd9bfce437aa62ea7eed7d5 100644
--- a/samba/locale/fr/fusiondirectory.po
+++ b/samba/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/samba/locale/hu_HU/fusiondirectory.po b/samba/locale/hu_HU/fusiondirectory.po
index 859e95f4e2c3c369e6abcfd1b82b6b75568660d6..de7784bcfa7c18061d059e730a69e7344bb0d6ce 100644
--- a/samba/locale/hu_HU/fusiondirectory.po
+++ b/samba/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/samba/locale/id/fusiondirectory.po b/samba/locale/id/fusiondirectory.po
index 60edc56d9dc8a2b254b7e5369f71e83925c3ff0f..12a4cb72c74e78795c49120eb56d5520e5c506eb 100644
--- a/samba/locale/id/fusiondirectory.po
+++ b/samba/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/samba/locale/it_IT/fusiondirectory.po b/samba/locale/it_IT/fusiondirectory.po
index 27ba8e2e99ee74a07e59f80c1c79b12e73b75d4e..72ff3a1a33ff03cab234002d9ffeb35ccbfb591d 100644
--- a/samba/locale/it_IT/fusiondirectory.po
+++ b/samba/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/samba/locale/ja/fusiondirectory.po b/samba/locale/ja/fusiondirectory.po
index e5b3883f459119591abe9ef1fd18c83e2b7bf99e..4cc3768438fc26bede72a9e2983d5dab44ca7059 100644
--- a/samba/locale/ja/fusiondirectory.po
+++ b/samba/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/samba/locale/ko/fusiondirectory.po b/samba/locale/ko/fusiondirectory.po
index b9389f56654a926cdf10b6fa71bf4827ab139511..cad5a8b6f541aac64b61151860f570146a81e0eb 100644
--- a/samba/locale/ko/fusiondirectory.po
+++ b/samba/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/samba/locale/lv/fusiondirectory.po b/samba/locale/lv/fusiondirectory.po
index e6800b731fa5ca400fbb806cb04ea293b6e6a62e..113c2e1912a405a32b8b44a15e5cf7c836e83f27 100644
--- a/samba/locale/lv/fusiondirectory.po
+++ b/samba/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/samba/locale/nb/fusiondirectory.po b/samba/locale/nb/fusiondirectory.po
index 49c9edeee404ee1e45c4f9621dd86eb733eb2622..7f68fb942919439b68c56508b6eff4a2a1664a66 100644
--- a/samba/locale/nb/fusiondirectory.po
+++ b/samba/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/samba/locale/nl/fusiondirectory.po b/samba/locale/nl/fusiondirectory.po
index 3464f3e3548df9e2cd92e3b9d8353919420a7df1..4f05d00121bc12bfeac80550a200ede6ad2896bf 100644
--- a/samba/locale/nl/fusiondirectory.po
+++ b/samba/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/samba/locale/pl/fusiondirectory.po b/samba/locale/pl/fusiondirectory.po
index c382fd14f7498a3490ac26d53babf53a145910f5..825c1acff1190c03a31e25ca75251737b3a73399 100644
--- a/samba/locale/pl/fusiondirectory.po
+++ b/samba/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/samba/locale/pt/fusiondirectory.po b/samba/locale/pt/fusiondirectory.po
index 3751485d2b150330dcba9010ca55a3bf0db6bd56..4d504b487bdfd78cd91b4cd260b24f18bd4de7e5 100644
--- a/samba/locale/pt/fusiondirectory.po
+++ b/samba/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/samba/locale/pt_BR/fusiondirectory.po b/samba/locale/pt_BR/fusiondirectory.po
index 7642b8132ff92a9f8d84ced8257d68ee25d2b589..28b75eb8cc49de0f569398c60f1a0d43f3053dfd 100644
--- a/samba/locale/pt_BR/fusiondirectory.po
+++ b/samba/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/samba/locale/ru/fusiondirectory.po b/samba/locale/ru/fusiondirectory.po
index 81e4ecd21b7adaa0e2068846b290bb073cbd7ae4..9a3b9d6806db666d049a3b178b379c41e8084bbd 100644
--- a/samba/locale/ru/fusiondirectory.po
+++ b/samba/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/samba/locale/ru@petr1708/fusiondirectory.po b/samba/locale/ru@petr1708/fusiondirectory.po
index b13493f91bc3d47720007be366adcca3a52a4e96..54785d53236fa2feea15d1193ca4322865ba6ab4 100644
--- a/samba/locale/ru@petr1708/fusiondirectory.po
+++ b/samba/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/samba/locale/sv/fusiondirectory.po b/samba/locale/sv/fusiondirectory.po
index ae3a2c70ed59c732337ed0b817f671c57b2f6012..40c8b14110b085a5b7a1cd5537fbd1ef9138b9c1 100644
--- a/samba/locale/sv/fusiondirectory.po
+++ b/samba/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/samba/locale/tr_TR/fusiondirectory.po b/samba/locale/tr_TR/fusiondirectory.po
index e4946ef24cac0293485ff8c929193fea9ebf71a7..9822fc37244ac8d28d0c3c3de71b94e1980f3bfb 100644
--- a/samba/locale/tr_TR/fusiondirectory.po
+++ b/samba/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/samba/locale/ug/fusiondirectory.po b/samba/locale/ug/fusiondirectory.po
index ed62e501c65ff7f72fffd4b00aaea69b8a9a55b5..fbb32d3b78aa5033e7aef6ca12376caec8f579c7 100644
--- a/samba/locale/ug/fusiondirectory.po
+++ b/samba/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/samba/locale/vi_VN/fusiondirectory.po b/samba/locale/vi_VN/fusiondirectory.po
index 9fbc95e3e87ab781130211e62e6d3e2cc10b3523..2356354975e66a89a3d6a06f5eb8fcc25f19928e 100644
--- a/samba/locale/vi_VN/fusiondirectory.po
+++ b/samba/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/samba/locale/zh/fusiondirectory.po b/samba/locale/zh/fusiondirectory.po
index c4d2dbf3e577832d98789bfb54e2b631b93dd547..807ab5a9972b3c37cf2e0d0b4e2194f48b4d7189 100644
--- a/samba/locale/zh/fusiondirectory.po
+++ b/samba/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/samba/locale/zh_TW/fusiondirectory.po b/samba/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..0b4bcc4df3e58e3ee89ef1f8313619380289ee74
--- /dev/null
+++ b/samba/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,616 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: include/class_smbHash.inc:356
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
+msgstr ""
+
+#: admin/samba/class_sambaDomainManagement.inc:34
+msgid "Samba domains"
+msgstr ""
+
+#: 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 ""
+
+#: admin/samba/class_sambaDomain.inc:35
+msgid "Samba domain settings"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:51
+#: admin/systems/samba/class_sambaSystemTab.inc:44
+msgid "Properties"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Domain name"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:54
+msgid "Name of this domain"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:58
+msgid "SID of this domain"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Rid base"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:62
+msgid "Algorithmic rid base"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:66
+msgid "Minimum password age"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:67
+msgid ""
+"Minimum password age, in seconds (default: 0 => allow immediate password "
+"change)"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:72
+msgid "Maximum password age"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:73
+msgid ""
+"Maximum password age, in seconds (default: -1 => never expire passwords)"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:78
+msgid "Next RID"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:79
+msgid "Next NT rid to give out for anything"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:83
+msgid "Next group RID"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:84
+msgid "Next NT rid to give out for groups"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:88
+msgid "Next user RID"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:89
+msgid "Next NT rid to give our for users"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:93
+msgid "Minimum password length"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:94
+msgid "Minimal password length (default: 5)"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:98
+msgid "Password history length"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:99
+msgid "Length of Password History Entries (default: 0 => off)"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:103
+msgid "Logon to change password"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:104
+msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:108
+msgid "Lockout duration"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:109
+msgid "Lockout duration in minutes (default: 30, -1 => forever)"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:113
+msgid "Lockout observation window"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:114
+msgid "Reset time after lockout in minutes (default: 30)"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:118
+msgid "Lockout threshold"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:119
+msgid "Lockout users after bad logon attempts (default: 0 => off)"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:123
+msgid "Force logoff"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:124
+msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:128
+msgid "Refuse machine password change"
+msgstr ""
+
+#: admin/samba/class_sambaDomain.inc:129
+msgid "Allow Machine Password changes (default: 0 => off)"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
+#: config/samba/class_sambaPluginConfig.inc:28
+#: personal/samba/class_sambaAccount.inc:158
+msgid "Samba"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:30
+msgid "Samba group settings"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:42
+#: admin/groups/samba/class_sambaGroup.inc:45
+#: admin/systems/samba/class_sambaSystemTab.inc:53
+#: personal/samba/class_sambaAccount.inc:199
+msgid "Domain"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:45
+msgid "Samba domain"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:49
+msgid "Samba information"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Group type"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:56
+msgid "Samba group type"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Samba group"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain admins"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain users"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:60
+#: admin/groups/samba/class_sambaGroup.inc:120
+msgid "Domain guests"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Configuration error"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:106
+msgid "Cannot find group SID in your configuration!"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:120
+#, php-format
+msgid "Special group (%d)"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:511
+#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:558
+msgid "Warning"
+msgstr ""
+
+#: admin/groups/samba/class_sambaGroup.inc:133
+#: personal/samba/class_sambaAccount.inc:511
+msgid "Undefined Samba SID detected. Please fix this problem manually!"
+msgstr ""
+
+#: admin/systems/samba/class_argonautEventSambaShares.inc:27
+msgid "Update Samba Shares"
+msgstr ""
+
+#: admin/systems/samba/class_sambaSystemTab.inc:31
+msgid "Windows workstation information"
+msgstr ""
+
+#: admin/systems/samba/class_sambaSystemTab.inc:53
+#: personal/samba/class_sambaAccount.inc:199
+msgid "Samba domain name"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:29
+msgid "Samba plugin configuration"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:41
+#: personal/samba/class_sambaAccount.inc:159
+msgid "Samba settings"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:44
+msgid "Samba ID mapping"
+msgstr ""
+
+#: 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:49
+msgid "Samba SID"
+msgstr ""
+
+#: 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:55
+msgid "Samba rid base"
+msgstr ""
+
+#: 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:61
+msgid "Expiration date synchronisaton"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:61
+msgid "Synchronisaton the expiration date with the POSIX one?"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:67
+msgid "Generate sambaLMPassword"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:67
+msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
+msgstr ""
+
+#: config/samba/class_sambaPluginConfig.inc:71
+msgid "Activate primary group warning"
+msgstr ""
+
+#: 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 ""
+
+#: personal/samba/class_sambaAccount.inc:31
+msgid "Samba Munged Dial"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:183
+msgid "Samba profile"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Home directory drive"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:189
+#: personal/samba/class_sambaAccount.inc:222
+msgid "Letter for the home drive"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "Home directory path"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:194
+#: personal/samba/class_sambaAccount.inc:227
+msgid "UNC path for the home drive"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Script path"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:203
+msgid "Login script path"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "Profile path"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:207
+#: personal/samba/class_sambaAccount.inc:232
+msgid "UNC profile path"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:214
+msgid "Terminal server"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:218
+msgid "Allow login on terminal server"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client config"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:237
+msgid "Inherit client configuration"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Initial progam"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:241
+msgid "Program to start after connecting"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Working directory"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:245
+msgid "Basic working directory"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Connection timeout"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:249
+msgid "Timeout when connecting to terminal server"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Disconnection timeout"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:254
+msgid "Timeout before disconnecting from terminal server"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:259
+msgid "Idle timeout before disconnecting from terminal server"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Connect client drives at logon"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:264
+msgid "Drive to connect after login"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Connect client printers at logon"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:268
+msgid "Printers to connect after login"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default to main client printer"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:272
+msgid "Default printer for this client"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:276
+msgid "Shadowing"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:279
+msgid "disabled"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify on"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:279
+msgid "input on, notify off"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, notify on"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:280
+msgid "input off, nofify off"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:283
+msgid "On broken or timed out"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:283
+msgid "What happen if disconnected or timeout"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:286
+msgid "disconnect"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:286
+msgid "reset"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:289
+msgid "Reconnect if disconnected"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from any client"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:292
+msgid "from previous client only"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:304
+msgid "Access options"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Enforce password change"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:308
+msgid "Force the user to change his password"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password never expire"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:313
+msgid "The password will never expire"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from windows client requires no password"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:318
+msgid "Login from a client without a password"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock samba account"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:323
+msgid "Lock the account"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Cannot change password"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:328
+msgid "Not allowed to change password"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:332
+msgid "Account expiration"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:332
+msgid "When does the account expire"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:340
+msgid "Samba logon times"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:340
+msgid "What is the allowed time to connect"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:341
+msgid "Edit settings"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:357
+msgid "System trust"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Allow connection from these workstations only"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:363
+msgid "Only allow this user to connect to this list of hosts"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:479
+#: personal/samba/class_sambaAccount.inc:486
+#, php-format
+msgid "Field \"%s\" is required when \"%s\" is filled! Fill both field or empty them."
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:494
+msgid "The windows user manager allows eight clients at maximum!"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:538
+msgid ""
+"Cannot convert primary group to samba group: group cannot be identified!"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:559
+msgid ""
+"Cannot convert primary group to samba group: group samba tab is disabled!"
+msgstr ""
+
+#: personal/samba/sambaLogonHours.tpl.c:2
+msgid "Specify the hours this user is allowed to log in"
+msgstr ""
+
+#: personal/samba/sambaLogonHours.tpl.c:5
+msgid "Hour"
+msgstr ""
diff --git a/sogo/locale/af_ZA/fusiondirectory.po b/sogo/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..b5f43179c3d243ea292762df3b8f08f3b35bca23
--- /dev/null
+++ b/sogo/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,72 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38 config/sogo/class_sogoConfig.inc:42
+msgid "SOGo"
+msgstr ""
+
+#: admin/sogo/class_sogoManagement.inc:34
+msgid "SOGo management"
+msgstr ""
+
+#: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
+#: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
+msgid "SOGo resource"
+msgstr ""
+
+#: admin/sogo/class_sogoResource.inc:57
+msgid "Entry name"
+msgstr ""
+
+#: admin/sogo/class_sogoResource.inc:57
+msgid "Account name"
+msgstr ""
+
+#: admin/sogo/class_sogoResource.inc:61
+msgid "Mail"
+msgstr ""
+
+#: admin/sogo/class_sogoResource.inc:67
+msgid "description"
+msgstr ""
+
+#: admin/sogo/class_sogoResource.inc:71
+msgid "Multiplebookings"
+msgstr ""
+
+#: admin/sogo/class_sogoResource.inc:76
+msgid "Kind"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr ""
diff --git a/sogo/locale/ar/fusiondirectory.po b/sogo/locale/ar/fusiondirectory.po
index 11c2936cb5a52d11ade2e5f474f50d76b3e84751..e0af0fad7800bbee4b5c12f3e7067cad2c750c9d 100644
--- a/sogo/locale/ar/fusiondirectory.po
+++ b/sogo/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/sogo/locale/ca/fusiondirectory.po b/sogo/locale/ca/fusiondirectory.po
index f5bfa9b3051ac02402ca20fd431f42a88004e3b8..88b7116461e26d11f3ffd66b8a207e255cfe212e 100644
--- a/sogo/locale/ca/fusiondirectory.po
+++ b/sogo/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sogo/locale/cs_CZ/fusiondirectory.po b/sogo/locale/cs_CZ/fusiondirectory.po
index ec8f23724c92e00616b3cde87ea0ccd5d3d5adbc..bcf2420596222e793c9ed41ca27148b7efaac7e8 100644
--- a/sogo/locale/cs_CZ/fusiondirectory.po
+++ b/sogo/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/sogo/class_sogoManagement.inc:33
 #: admin/sogo/class_sogoManagement.inc:38 config/sogo/class_sogoConfig.inc:42
diff --git a/sogo/locale/de/fusiondirectory.po b/sogo/locale/de/fusiondirectory.po
index 7de0876937bed4bfa1de8ee829cfc723f8ef1bf3..f2abeb10ede93e04178208ec603fdaba1643ffcd 100644
--- a/sogo/locale/de/fusiondirectory.po
+++ b/sogo/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sogo/locale/el_GR/fusiondirectory.po b/sogo/locale/el_GR/fusiondirectory.po
index 8ddca33a7495bded7f9e92fc31d2512555490dea..7c7457a520f083ab213d2c6798347cc42e3b30d7 100644
--- a/sogo/locale/el_GR/fusiondirectory.po
+++ b/sogo/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sogo/locale/es/fusiondirectory.po b/sogo/locale/es/fusiondirectory.po
index 7425a360e023351c297e50a21f4d329756553a58..3dbf9dcbd3ba178d59b273ab318a8c7d9ad26177 100644
--- a/sogo/locale/es/fusiondirectory.po
+++ b/sogo/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sogo/locale/es_CO/fusiondirectory.po b/sogo/locale/es_CO/fusiondirectory.po
index 5ef6d4048dad4f7363c38b71b729496903bacaa9..17710aeecfd833730109b58a1c42cd3f7d2ba6c4 100644
--- a/sogo/locale/es_CO/fusiondirectory.po
+++ b/sogo/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sogo/locale/es_VE/fusiondirectory.po b/sogo/locale/es_VE/fusiondirectory.po
index 7b213e5cc5401d2b5ccb3198a299f7376057d21f..fe3cbdd7c391d80cf555f591ffc3676a6b15a7d6 100644
--- a/sogo/locale/es_VE/fusiondirectory.po
+++ b/sogo/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sogo/locale/fa_IR/fusiondirectory.po b/sogo/locale/fa_IR/fusiondirectory.po
index 2414081c073c3263d864adc2b3c2d305a1d06db2..302bde501ca83497e316f5060518d99278c1ecf4 100644
--- a/sogo/locale/fa_IR/fusiondirectory.po
+++ b/sogo/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/sogo/class_sogoManagement.inc:33
 #: admin/sogo/class_sogoManagement.inc:38 config/sogo/class_sogoConfig.inc:42
diff --git a/sogo/locale/fi_FI/fusiondirectory.po b/sogo/locale/fi_FI/fusiondirectory.po
index 20a4f439b46e3cdf98d1e81c4bd0694d7fdd090a..f42ff34098d4f47467f16644f4c5b43fb4848c08 100644
--- a/sogo/locale/fi_FI/fusiondirectory.po
+++ b/sogo/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sogo/locale/fr/fusiondirectory.po b/sogo/locale/fr/fusiondirectory.po
index 1030cb56c932a700449ca0e3fb8da3ad3107fef3..617134d6cdce5269aeb353260473050efb770105 100644
--- a/sogo/locale/fr/fusiondirectory.po
+++ b/sogo/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/sogo/locale/hu_HU/fusiondirectory.po b/sogo/locale/hu_HU/fusiondirectory.po
index cc4c0bb90cf61650e76091a08d4e37db30190883..ec727ffbe0086a68b6efb9f4e572b1855def7709 100644
--- a/sogo/locale/hu_HU/fusiondirectory.po
+++ b/sogo/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sogo/locale/id/fusiondirectory.po b/sogo/locale/id/fusiondirectory.po
index 604a08dfd0aebdbf3f2e19742856f29e63e31312..a543d40ef2be5d057bf3385068f96f3769d0ed6c 100644
--- a/sogo/locale/id/fusiondirectory.po
+++ b/sogo/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sogo/locale/it_IT/fusiondirectory.po b/sogo/locale/it_IT/fusiondirectory.po
index 2e1ff77c030c05bc408da3f810f8051e80da1865..c2866fbc8b0be6cec54cc96b5e813f9dc1ab8e74 100644
--- a/sogo/locale/it_IT/fusiondirectory.po
+++ b/sogo/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/sogo/locale/ja/fusiondirectory.po b/sogo/locale/ja/fusiondirectory.po
index 18ce2f1d29941e1bf75b4384daae1143e2849770..90eeaf497dcca9394198d3dd97eb8e2796ea055a 100644
--- a/sogo/locale/ja/fusiondirectory.po
+++ b/sogo/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sogo/locale/ko/fusiondirectory.po b/sogo/locale/ko/fusiondirectory.po
index 256ea66a15b915f820c017fb18ec75f6992b0592..3afaeeb34c9dd81b629d465f4a6b5b95e9129153 100644
--- a/sogo/locale/ko/fusiondirectory.po
+++ b/sogo/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/sogo/locale/lv/fusiondirectory.po b/sogo/locale/lv/fusiondirectory.po
index 61f7a023916166fb389ae3a761e2ddf15f7769a9..588829bc76e2f7c86069691bef830011818d2384 100644
--- a/sogo/locale/lv/fusiondirectory.po
+++ b/sogo/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/sogo/locale/nb/fusiondirectory.po b/sogo/locale/nb/fusiondirectory.po
index 48b56dd3418a1747b90e59c4bbfbbb3d33d58202..35103a6d2e89b09f9eb86e7b6ae155238ac4ffaf 100644
--- a/sogo/locale/nb/fusiondirectory.po
+++ b/sogo/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/sogo/locale/nl/fusiondirectory.po b/sogo/locale/nl/fusiondirectory.po
index 602de88681ac429a334afa53ebb8d081ffffed54..50f40ffdcaed74bb6843cfa9361203f8bc357ae8 100644
--- a/sogo/locale/nl/fusiondirectory.po
+++ b/sogo/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/sogo/locale/pl/fusiondirectory.po b/sogo/locale/pl/fusiondirectory.po
index 44778ca07a7c40a615d0a6afd636340a08a584e0..27db7d50470892b1a74561a1a2ef6b92f997be2d 100644
--- a/sogo/locale/pl/fusiondirectory.po
+++ b/sogo/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sogo/locale/pt/fusiondirectory.po b/sogo/locale/pt/fusiondirectory.po
index 83f5ff5c5b29a774d091f3d0d2e0f0890dc7f643..1dd4e9f210755df63675767f92134e8173e0a652 100644
--- a/sogo/locale/pt/fusiondirectory.po
+++ b/sogo/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/sogo/locale/pt_BR/fusiondirectory.po b/sogo/locale/pt_BR/fusiondirectory.po
index 9e99a64d16bbced9b422f04818f785cf8e825786..92ba2e70066ae4b17d9901299ee83254b2de10b7 100644
--- a/sogo/locale/pt_BR/fusiondirectory.po
+++ b/sogo/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sogo/locale/ru/fusiondirectory.po b/sogo/locale/ru/fusiondirectory.po
index bde8f7cfe4ea31ff52af57f98ec18978bdf4372f..d8556b0cf7334c2c9c0031b98e89c95044ad8c10 100644
--- a/sogo/locale/ru/fusiondirectory.po
+++ b/sogo/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sogo/locale/ru@petr1708/fusiondirectory.po b/sogo/locale/ru@petr1708/fusiondirectory.po
index e0d51fdbabd49d6b14058ff4b429a6fee0b764df..34c4c7214bb4471386d6f1372378eca19973f926 100644
--- a/sogo/locale/ru@petr1708/fusiondirectory.po
+++ b/sogo/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sogo/locale/sv/fusiondirectory.po b/sogo/locale/sv/fusiondirectory.po
index 1dcb13b925a9296b5e2a27c4f1a70ed3225142d8..6714452aeb67713020d9543b737216cc496d913a 100644
--- a/sogo/locale/sv/fusiondirectory.po
+++ b/sogo/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sogo/locale/tr_TR/fusiondirectory.po b/sogo/locale/tr_TR/fusiondirectory.po
index 946abedcc33994baf2550359c7cb26aebad49331..f1146cc68f197833596d75a8b346cfbccc9695e1 100644
--- a/sogo/locale/tr_TR/fusiondirectory.po
+++ b/sogo/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sogo/locale/ug/fusiondirectory.po b/sogo/locale/ug/fusiondirectory.po
index 21c65afaf92fc4fe5b575fd3d18347d296180c13..eec4ace964bb60a56c5ea6d876023d0b93495335 100644
--- a/sogo/locale/ug/fusiondirectory.po
+++ b/sogo/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sogo/locale/vi_VN/fusiondirectory.po b/sogo/locale/vi_VN/fusiondirectory.po
index dcaf0391d8c32b20e9e4d8cb59bd3b8ea6ed14da..9e5aa8cb1d6ce200e96a69366fb781dbdef93e6a 100644
--- a/sogo/locale/vi_VN/fusiondirectory.po
+++ b/sogo/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/sogo/locale/zh/fusiondirectory.po b/sogo/locale/zh/fusiondirectory.po
index 5e875bfef5e30ab607f5245c1c1a7b3ab5ed52b0..fa30171cf41a8d440df2a1bbbbc7767f12834a43 100644
--- a/sogo/locale/zh/fusiondirectory.po
+++ b/sogo/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sogo/locale/zh_TW/fusiondirectory.po b/sogo/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..4245186fbee223ea2ef01ab90ee469193b8e1157
--- /dev/null
+++ b/sogo/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,72 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38 config/sogo/class_sogoConfig.inc:42
+msgid "SOGo"
+msgstr ""
+
+#: admin/sogo/class_sogoManagement.inc:34
+msgid "SOGo management"
+msgstr ""
+
+#: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
+#: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
+msgid "SOGo resource"
+msgstr ""
+
+#: admin/sogo/class_sogoResource.inc:57
+msgid "Entry name"
+msgstr ""
+
+#: admin/sogo/class_sogoResource.inc:57
+msgid "Account name"
+msgstr ""
+
+#: admin/sogo/class_sogoResource.inc:61
+msgid "Mail"
+msgstr ""
+
+#: admin/sogo/class_sogoResource.inc:67
+msgid "description"
+msgstr ""
+
+#: admin/sogo/class_sogoResource.inc:71
+msgid "Multiplebookings"
+msgstr ""
+
+#: admin/sogo/class_sogoResource.inc:76
+msgid "Kind"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:28
+msgid "SOGo configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:29
+msgid "FusionDirectory sogo plugin configuration"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "SOGo RDN"
+msgstr ""
+
+#: config/sogo/class_sogoConfig.inc:45
+msgid "Branch in which SOGo objects will be stored"
+msgstr ""
diff --git a/spamassassin/locale/af_ZA/fusiondirectory.po b/spamassassin/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..a156e3517e424c3cba63e8f0c9f6827a0253c435
--- /dev/null
+++ b/spamassassin/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,128 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
+msgid "Spamassassin service"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
+msgid "Spam tagging"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
+msgid "Rewrite header"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
+msgid "Required score"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
+msgid "Select required score to tag mail as spam"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
+msgid "Trusted networks"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
+msgid "Flags"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
+msgid "Enable use of bayes filtering"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
+msgid "Enable bayes auto learning"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
+msgid "Enable RBL checks"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
+msgid "Enable use of Razor"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
+msgid "Enable use of DCC"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
+msgid "Enable use of Pyzor"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
+msgid "Rules"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
+msgid "Edit spam rule"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
+msgid "Name"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
+msgid "Rule"
+msgstr ""
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:31
+msgid "Spam rules"
+msgstr ""
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:38
+msgid "SpamAssassin user preferences settings"
+msgstr ""
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:42
+msgid "Directive"
+msgstr ""
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:42
+msgid "The name of a SpamAssassin configuration directive"
+msgstr ""
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:47
+msgid "Value"
+msgstr ""
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:47
+msgid "The value for the directive"
+msgstr ""
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:54
+msgid "SpamAssassin user rules"
+msgstr ""
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:65
+msgid "SpamAssassin"
+msgstr ""
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:66
+msgid "Edit user's spam rules"
+msgstr ""
diff --git a/spamassassin/locale/ar/fusiondirectory.po b/spamassassin/locale/ar/fusiondirectory.po
index a20330fe841ce7f28c2b360f7d486f00d9391e37..ba062cdb13fbc004e21c1d58bd48802035726712 100644
--- a/spamassassin/locale/ar/fusiondirectory.po
+++ b/spamassassin/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/spamassassin/locale/ca/fusiondirectory.po b/spamassassin/locale/ca/fusiondirectory.po
index 171a87f3734d1ee2f44b650eb9443e9112777c49..2f159e86db1022d8f11b007d9b7edc22da938d82 100644
--- a/spamassassin/locale/ca/fusiondirectory.po
+++ b/spamassassin/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/spamassassin/locale/cs_CZ/fusiondirectory.po b/spamassassin/locale/cs_CZ/fusiondirectory.po
index d33934ae52b9447240246bbdc9d88de0f4d9f78b..7d8f45dd006fca0d52018f69245a587321e44185 100644
--- a/spamassassin/locale/cs_CZ/fusiondirectory.po
+++ b/spamassassin/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
diff --git a/spamassassin/locale/de/fusiondirectory.po b/spamassassin/locale/de/fusiondirectory.po
index 0a80249927c299a615efec61ad08bf1ec302e02b..90a05dc1effeff2cdf6f25f166e775f0cbb652f2 100644
--- a/spamassassin/locale/de/fusiondirectory.po
+++ b/spamassassin/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/spamassassin/locale/el_GR/fusiondirectory.po b/spamassassin/locale/el_GR/fusiondirectory.po
index 75f3f0f21ae1ee87e7a5db5b84f109c4de8fb76b..0e52d66fab8bae93613bf208728696baaa4132cc 100644
--- a/spamassassin/locale/el_GR/fusiondirectory.po
+++ b/spamassassin/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/spamassassin/locale/es/fusiondirectory.po b/spamassassin/locale/es/fusiondirectory.po
index e9f1370382d059a45558788c00eb3f4026b68768..55536c549acf2d616569e3d2f2522740bbce334e 100644
--- a/spamassassin/locale/es/fusiondirectory.po
+++ b/spamassassin/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/spamassassin/locale/es_CO/fusiondirectory.po b/spamassassin/locale/es_CO/fusiondirectory.po
index 0fe1a83a3c653dc562ee7fabb541e50ce82e3767..422cc5dbedf3840efb1e85bc9dbca97452084972 100644
--- a/spamassassin/locale/es_CO/fusiondirectory.po
+++ b/spamassassin/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/spamassassin/locale/es_VE/fusiondirectory.po b/spamassassin/locale/es_VE/fusiondirectory.po
index 3ab54f5ab4833cd0c04518a664ba006420d95e82..cb9bdd4486dc78a18e17a1c1a00db26365a3f43e 100644
--- a/spamassassin/locale/es_VE/fusiondirectory.po
+++ b/spamassassin/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/spamassassin/locale/fa_IR/fusiondirectory.po b/spamassassin/locale/fa_IR/fusiondirectory.po
index 609699f1ee562a1c37a5fcf80d0f400f60ecf1e6..ab7a4b118ba90285b305098125191b167f975469 100644
--- a/spamassassin/locale/fa_IR/fusiondirectory.po
+++ b/spamassassin/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
diff --git a/spamassassin/locale/fi_FI/fusiondirectory.po b/spamassassin/locale/fi_FI/fusiondirectory.po
index 57c7ac7302b7214abc5e3a2b14e1b8466ec0ef9d..8e372cc6be0628c8359ac1ba9fae5322a096d391 100644
--- a/spamassassin/locale/fi_FI/fusiondirectory.po
+++ b/spamassassin/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/spamassassin/locale/fr/fusiondirectory.po b/spamassassin/locale/fr/fusiondirectory.po
index d4ef15b6a3ff6ed452fd7c573233345f1bb508ab..4bbb156f2a5e63d3b847b920aac6eee2ba081bae 100644
--- a/spamassassin/locale/fr/fusiondirectory.po
+++ b/spamassassin/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/spamassassin/locale/hu_HU/fusiondirectory.po b/spamassassin/locale/hu_HU/fusiondirectory.po
index f289f3f9263adf971af6d0a73b6ab018a032d4d9..d1d7c0043bb21f732d2346351176ad455b48c3e2 100644
--- a/spamassassin/locale/hu_HU/fusiondirectory.po
+++ b/spamassassin/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/spamassassin/locale/id/fusiondirectory.po b/spamassassin/locale/id/fusiondirectory.po
index 9c748ced89f140126d540ceccb734c496b577467..300adaf0547b49997d85c3d9dbf5708ee5edda11 100644
--- a/spamassassin/locale/id/fusiondirectory.po
+++ b/spamassassin/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/spamassassin/locale/it_IT/fusiondirectory.po b/spamassassin/locale/it_IT/fusiondirectory.po
index ecc326a1e9e13c3cf867d1de099c7e945f065963..d56550eb27a5af9094dd7994291c48a62cad3cb0 100644
--- a/spamassassin/locale/it_IT/fusiondirectory.po
+++ b/spamassassin/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/spamassassin/locale/ja/fusiondirectory.po b/spamassassin/locale/ja/fusiondirectory.po
index 9b1fd30ddf2b6abcab6be049a539e3219fcd4dfe..f18a42f55dc43e4a9aca22c8450faea3005539b7 100644
--- a/spamassassin/locale/ja/fusiondirectory.po
+++ b/spamassassin/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/spamassassin/locale/ko/fusiondirectory.po b/spamassassin/locale/ko/fusiondirectory.po
index 768c78005226ffc008877fd83fcabe7a7b4463b3..781ded2205d843ae6a9613fc51e325b4d77af658 100644
--- a/spamassassin/locale/ko/fusiondirectory.po
+++ b/spamassassin/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/spamassassin/locale/lv/fusiondirectory.po b/spamassassin/locale/lv/fusiondirectory.po
index d6fbc4b231f521af953c7edf9a3004e7b35fc76c..9b34e040b24326853b3d8ed8b528684550ef4ddf 100644
--- a/spamassassin/locale/lv/fusiondirectory.po
+++ b/spamassassin/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/spamassassin/locale/nb/fusiondirectory.po b/spamassassin/locale/nb/fusiondirectory.po
index ca7f1af7b8e195161034a3e77ee38892c2f0fdbe..1d2a604ef3793c8b3c7a976a00c5c89ef5ff63e4 100644
--- a/spamassassin/locale/nb/fusiondirectory.po
+++ b/spamassassin/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/spamassassin/locale/nl/fusiondirectory.po b/spamassassin/locale/nl/fusiondirectory.po
index 69fad94f94bea71a056a106b8cf0944bf4b9a9cc..228af7998203229af43013882e4b173a14c7fffb 100644
--- a/spamassassin/locale/nl/fusiondirectory.po
+++ b/spamassassin/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Lucien Antonissen <lucien.antonissen@digipolis.be>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/spamassassin/locale/pl/fusiondirectory.po b/spamassassin/locale/pl/fusiondirectory.po
index 449364334fc3666b18036c2b20df8e3cfcc42e0a..03c6d8ccac6993e5cd7b4a5b0e7b5663edee1656 100644
--- a/spamassassin/locale/pl/fusiondirectory.po
+++ b/spamassassin/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/spamassassin/locale/pt/fusiondirectory.po b/spamassassin/locale/pt/fusiondirectory.po
index cb4e4ddc09889ad8c56a5b995e82f0e668075ce3..a90932d75591faf600434c1403ab2fe4e1d2ccd4 100644
--- a/spamassassin/locale/pt/fusiondirectory.po
+++ b/spamassassin/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/spamassassin/locale/pt_BR/fusiondirectory.po b/spamassassin/locale/pt_BR/fusiondirectory.po
index 669ea5d96dfdb122284a447fd9a307fd190519ca..78d530bfde1c03fe2decc7ed3ef42ee1f067b1a5 100644
--- a/spamassassin/locale/pt_BR/fusiondirectory.po
+++ b/spamassassin/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/spamassassin/locale/ru/fusiondirectory.po b/spamassassin/locale/ru/fusiondirectory.po
index 6230ff1ea777d7cf40a1baab692fe63b53b7bda0..f581e6f2ecee56d24131e6795141e644e1e7504d 100644
--- a/spamassassin/locale/ru/fusiondirectory.po
+++ b/spamassassin/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/spamassassin/locale/ru@petr1708/fusiondirectory.po b/spamassassin/locale/ru@petr1708/fusiondirectory.po
index d99a89acdbe8e124225c6335629e3b9b507b1c55..d047040b0116d02e7492928bb9616c6f51e46a9d 100644
--- a/spamassassin/locale/ru@petr1708/fusiondirectory.po
+++ b/spamassassin/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/spamassassin/locale/sv/fusiondirectory.po b/spamassassin/locale/sv/fusiondirectory.po
index 95e569dafce8be58f4d9e50d12c90874d3e6c995..78026d0ecddcb9b9dface401cc81bfd59106c43f 100644
--- a/spamassassin/locale/sv/fusiondirectory.po
+++ b/spamassassin/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/spamassassin/locale/tr_TR/fusiondirectory.po b/spamassassin/locale/tr_TR/fusiondirectory.po
index 5a9926f85263be7bb02262982d43865233c01cb1..79b40fb79239e6725f6c3ee7a096e9af5824fbba 100644
--- a/spamassassin/locale/tr_TR/fusiondirectory.po
+++ b/spamassassin/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/spamassassin/locale/ug/fusiondirectory.po b/spamassassin/locale/ug/fusiondirectory.po
index 9f1effaee87675f72325cd468e3d6de4b3985b10..144e11ce0d8992ec96461884cfbd45e01ae70c53 100644
--- a/spamassassin/locale/ug/fusiondirectory.po
+++ b/spamassassin/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/spamassassin/locale/vi_VN/fusiondirectory.po b/spamassassin/locale/vi_VN/fusiondirectory.po
index 6155790dbd68b5b58b19a718596a50ddcc298df6..b89f7954b05b5750a0948e9ad387c1dd6a4f6f90 100644
--- a/spamassassin/locale/vi_VN/fusiondirectory.po
+++ b/spamassassin/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/spamassassin/locale/zh/fusiondirectory.po b/spamassassin/locale/zh/fusiondirectory.po
index 0bb6a81c7ff51f1c453a4d99c6c250306b31a833..cc8c6f943a2aa325f9e687562cc535662212bd28 100644
--- a/spamassassin/locale/zh/fusiondirectory.po
+++ b/spamassassin/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/spamassassin/locale/zh_TW/fusiondirectory.po b/spamassassin/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..43f5f14f3b0f51dcf0085aa91b35465f9e809ad7
--- /dev/null
+++ b/spamassassin/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,128 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:31
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
+msgid "Spamassassin service"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
+msgid "Spam tagging"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
+msgid "Rewrite header"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
+msgid "Required score"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
+msgid "Select required score to tag mail as spam"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
+msgid "Trusted networks"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
+msgid "Flags"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
+msgid "Enable use of bayes filtering"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
+msgid "Enable bayes auto learning"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
+msgid "Enable RBL checks"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
+msgid "Enable use of Razor"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
+msgid "Enable use of DCC"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
+msgid "Enable use of Pyzor"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
+msgid "Rules"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
+msgid "Edit spam rule"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
+msgid "Name"
+msgstr ""
+
+#: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
+msgid "Rule"
+msgstr ""
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:31
+msgid "Spam rules"
+msgstr ""
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:38
+msgid "SpamAssassin user preferences settings"
+msgstr ""
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:42
+msgid "Directive"
+msgstr ""
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:42
+msgid "The name of a SpamAssassin configuration directive"
+msgstr ""
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:47
+msgid "Value"
+msgstr ""
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:47
+msgid "The value for the directive"
+msgstr ""
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:54
+msgid "SpamAssassin user rules"
+msgstr ""
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:65
+msgid "SpamAssassin"
+msgstr ""
+
+#: personal/spamassassin/class_spamAssassinAccount.inc:66
+msgid "Edit user's spam rules"
+msgstr ""
diff --git a/squid/locale/af_ZA/fusiondirectory.po b/squid/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..92609543d3b4fb3da722edcb96f4ff16bfc64f4c
--- /dev/null
+++ b/squid/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,117 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/squid/class_proxyAccount.inc:65
+msgid "Proxy"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:66
+msgid "This allow to store basic squid settings in ldap for each user"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:84
+msgid "Proxy account"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:90
+msgid "Filter unwanted content (i.e. pornographic or violence related)"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:91
+msgid "filterF"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:97
+msgid "Working Start"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:100
+#: personal/squid/class_proxyAccount.inc:115
+msgid "HourStart"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:101
+msgid "MinuteStart"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:109
+msgid "Limit proxy access to working time"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:112
+msgid "Working Stop"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:115
+msgid "-"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:116
+msgid ":"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:116
+msgid "MinuteStop"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
+msgid "Restrict proxy usage by quota"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:125
+msgid "Up"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
+msgid "per"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:139
+msgid "hour"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:139
+msgid "day"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:139
+msgid "week"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:139
+msgid "month"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:142
+msgid "Start Working Hours"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:143
+msgid "Starting hours for internet access"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:151
+msgid "Proxy Quota"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:152
+msgid "Max Data quota for the proxy"
+msgstr ""
diff --git a/squid/locale/ar/fusiondirectory.po b/squid/locale/ar/fusiondirectory.po
index cd5ae96cd4bad790fbb04bdb9c61601ab3eb22a2..13ae7bdc4d236dba5c1695cfaab4a257fc1c21c1 100644
--- a/squid/locale/ar/fusiondirectory.po
+++ b/squid/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/squid/locale/ca/fusiondirectory.po b/squid/locale/ca/fusiondirectory.po
index 9889b327ee44fcdca1d43b5920440af29ec0ac81..cb9b3d4a0f7e8b33c7a393de5052a97100dbf881 100644
--- a/squid/locale/ca/fusiondirectory.po
+++ b/squid/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/squid/locale/cs_CZ/fusiondirectory.po b/squid/locale/cs_CZ/fusiondirectory.po
index 27a7038f748fe6c5a1a05917b5fa580ba9a6777e..4c160ae420766924d871899bfa75146a8ffa61b3 100644
--- a/squid/locale/cs_CZ/fusiondirectory.po
+++ b/squid/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: personal/squid/class_proxyAccount.inc:65
 msgid "Proxy"
diff --git a/squid/locale/de/fusiondirectory.po b/squid/locale/de/fusiondirectory.po
index 87ad5edb12be3575112209299b4313cc90350d10..f777d0134e7d7849fc15a22d64072f601a9cdef7 100644
--- a/squid/locale/de/fusiondirectory.po
+++ b/squid/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/squid/locale/el_GR/fusiondirectory.po b/squid/locale/el_GR/fusiondirectory.po
index 6f3b2ea57a0b2f5b1cdca47ef93c113766206c0b..fe6e36afe8b616185e7a657a221d8f355efefda8 100644
--- a/squid/locale/el_GR/fusiondirectory.po
+++ b/squid/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/squid/locale/es/fusiondirectory.po b/squid/locale/es/fusiondirectory.po
index 4fa3b9f3c3fe0cfacd6808c8b47a6e2ba05cb878..959593132ca452204aeae78ea6a5255f23c7ce02 100644
--- a/squid/locale/es/fusiondirectory.po
+++ b/squid/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/squid/locale/es_CO/fusiondirectory.po b/squid/locale/es_CO/fusiondirectory.po
index 9055d6ddbd2153ce0f8e835d97d190d529148185..d0cb51ecf588f3a2d3568ee33cb0a15f7d9c71bb 100644
--- a/squid/locale/es_CO/fusiondirectory.po
+++ b/squid/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/squid/locale/es_VE/fusiondirectory.po b/squid/locale/es_VE/fusiondirectory.po
index 191fb5de8510b660ee09a310830b8f326253cb16..ab3e72f793d873bc980982baca222f719373c7a6 100644
--- a/squid/locale/es_VE/fusiondirectory.po
+++ b/squid/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/squid/locale/fa_IR/fusiondirectory.po b/squid/locale/fa_IR/fusiondirectory.po
index 84ba077f2d7bef542031418bd190755ae1cef2c0..ceb0a320673c3c906b65adff6f294d7abe61e02a 100644
--- a/squid/locale/fa_IR/fusiondirectory.po
+++ b/squid/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: personal/squid/class_proxyAccount.inc:65
 msgid "Proxy"
diff --git a/squid/locale/fi_FI/fusiondirectory.po b/squid/locale/fi_FI/fusiondirectory.po
index 3387bb381a86560691610e4c1b648c16b5a3eab3..4ee526c80ca681ae45245871348b231b1d75af06 100644
--- a/squid/locale/fi_FI/fusiondirectory.po
+++ b/squid/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/squid/locale/fr/fusiondirectory.po b/squid/locale/fr/fusiondirectory.po
index 8688591394f20c1786234521c68120ff8be9794c..5a669483d6ef99959132d5685786814f910f71c7 100644
--- a/squid/locale/fr/fusiondirectory.po
+++ b/squid/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/squid/locale/hu_HU/fusiondirectory.po b/squid/locale/hu_HU/fusiondirectory.po
index 8bc8a45d61a567c73a46f5f0e63ef8d72e4f5995..f4079a5048be1df52ec8d0bc32d58d6af9c9d447 100644
--- a/squid/locale/hu_HU/fusiondirectory.po
+++ b/squid/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/squid/locale/id/fusiondirectory.po b/squid/locale/id/fusiondirectory.po
index 0be8a6e66fc87cf5242ae02c2eb79daff8faddd6..94ab1e6de7a888cd6ee75cdb7b84ff622b6a6ae5 100644
--- a/squid/locale/id/fusiondirectory.po
+++ b/squid/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/squid/locale/it_IT/fusiondirectory.po b/squid/locale/it_IT/fusiondirectory.po
index bb5d5bb54f0849286cbe8e67d7d035f718c83f11..67af6c42e071446e3d87b8d7c84195e528a7bdff 100644
--- a/squid/locale/it_IT/fusiondirectory.po
+++ b/squid/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/squid/locale/ja/fusiondirectory.po b/squid/locale/ja/fusiondirectory.po
index 7b08b75a6e2d387328e7261c91fee246453b1e61..bf334830944628638d618fcfb0ad2d8f17c7c4b8 100644
--- a/squid/locale/ja/fusiondirectory.po
+++ b/squid/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/squid/locale/ko/fusiondirectory.po b/squid/locale/ko/fusiondirectory.po
index 785a57c7817335a13463c30eddefe9b106fa9a6a..08013c5875b389a21ff97fd85ef675f9000799b8 100644
--- a/squid/locale/ko/fusiondirectory.po
+++ b/squid/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/squid/locale/lv/fusiondirectory.po b/squid/locale/lv/fusiondirectory.po
index 06ffcfe664a24e025e346180c15e488ed029cdf3..5bf6b923be1b9bacb3977547cfd3702f94b1c69a 100644
--- a/squid/locale/lv/fusiondirectory.po
+++ b/squid/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/squid/locale/nb/fusiondirectory.po b/squid/locale/nb/fusiondirectory.po
index f1d263eafc2cc42cdb718502600de2cba89f2c63..f75fcada6350fdc8fb74373e23da755dbea6c8c0 100644
--- a/squid/locale/nb/fusiondirectory.po
+++ b/squid/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/squid/locale/nl/fusiondirectory.po b/squid/locale/nl/fusiondirectory.po
index adf32bd4859cbb2b77962c1f2238e97554440e70..3afcbc4c920ee0f9e682df70073dcb7031caec4f 100644
--- a/squid/locale/nl/fusiondirectory.po
+++ b/squid/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/squid/locale/pl/fusiondirectory.po b/squid/locale/pl/fusiondirectory.po
index c9dca2554a999f9f2f444801413cbad9d302513d..6151045f868fcc1eac751cb1e343c63005f940ae 100644
--- a/squid/locale/pl/fusiondirectory.po
+++ b/squid/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/squid/locale/pt/fusiondirectory.po b/squid/locale/pt/fusiondirectory.po
index 646aae3bc9eb0eada2bf3f5f983015b67bcc06d7..d2ff32f743d5e4e3ff991e0dbce52c9b7cf52703 100644
--- a/squid/locale/pt/fusiondirectory.po
+++ b/squid/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/squid/locale/pt_BR/fusiondirectory.po b/squid/locale/pt_BR/fusiondirectory.po
index e87248e500c19282a3cd35ffcddeb03277bcfdf8..2245ca2001d412f77fede042e742752365be8797 100644
--- a/squid/locale/pt_BR/fusiondirectory.po
+++ b/squid/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/squid/locale/ru/fusiondirectory.po b/squid/locale/ru/fusiondirectory.po
index d63600a0c3bc03efba5239d7b6c4872ead8a831f..f1e64689b69fa9e3494d903a0c1a86648d06531d 100644
--- a/squid/locale/ru/fusiondirectory.po
+++ b/squid/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/squid/locale/ru@petr1708/fusiondirectory.po b/squid/locale/ru@petr1708/fusiondirectory.po
index 53a168dc85737a07b22ca24133299d3d7ceedcb8..b7e900bf60f71c25f6fd08b1697d2dfdb5e89bdb 100644
--- a/squid/locale/ru@petr1708/fusiondirectory.po
+++ b/squid/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/squid/locale/sv/fusiondirectory.po b/squid/locale/sv/fusiondirectory.po
index 7c76075f81e4a753f64a6eb2d5d0d1c675733658..3a9500de918ef7a3f4dfbcd36d86b8c0778ecf78 100644
--- a/squid/locale/sv/fusiondirectory.po
+++ b/squid/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/squid/locale/tr_TR/fusiondirectory.po b/squid/locale/tr_TR/fusiondirectory.po
index b44039cf87c2f4a47f18610f2ef9408f99762efd..7573026ae91577b5987158c88d45e1dae75a56d1 100644
--- a/squid/locale/tr_TR/fusiondirectory.po
+++ b/squid/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/squid/locale/ug/fusiondirectory.po b/squid/locale/ug/fusiondirectory.po
index 2e7decbffd2272eab0c7f9df3d5213e4f3897837..484a739ba546cc0b7a78465ab2d5f59b85d27d06 100644
--- a/squid/locale/ug/fusiondirectory.po
+++ b/squid/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/squid/locale/vi_VN/fusiondirectory.po b/squid/locale/vi_VN/fusiondirectory.po
index 88ae070682b6da4f0e171eb9fd43dca03b56fbfe..f519a79bfd0102f3a43a0ab5b188e9f7357e15aa 100644
--- a/squid/locale/vi_VN/fusiondirectory.po
+++ b/squid/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/squid/locale/zh/fusiondirectory.po b/squid/locale/zh/fusiondirectory.po
index be1372da80a53e71152f9d117fd2d75dc7cfa219..85cf4edbcbe62040241a141a2f761ef507104412 100644
--- a/squid/locale/zh/fusiondirectory.po
+++ b/squid/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/squid/locale/zh_TW/fusiondirectory.po b/squid/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..7308d6676620f318d6b066c682a5d269c5316834
--- /dev/null
+++ b/squid/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,117 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: personal/squid/class_proxyAccount.inc:65
+msgid "Proxy"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:66
+msgid "This allow to store basic squid settings in ldap for each user"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:84
+msgid "Proxy account"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:90
+msgid "Filter unwanted content (i.e. pornographic or violence related)"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:91
+msgid "filterF"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:97
+msgid "Working Start"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:100
+#: personal/squid/class_proxyAccount.inc:115
+msgid "HourStart"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:101
+msgid "MinuteStart"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:109
+msgid "Limit proxy access to working time"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:112
+msgid "Working Stop"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:115
+msgid "-"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:116
+msgid ":"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:116
+msgid "MinuteStop"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
+msgid "Restrict proxy usage by quota"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:125
+msgid "Up"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
+msgid "per"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:139
+msgid "hour"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:139
+msgid "day"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:139
+msgid "week"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:139
+msgid "month"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:142
+msgid "Start Working Hours"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:143
+msgid "Starting hours for internet access"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:151
+msgid "Proxy Quota"
+msgstr ""
+
+#: personal/squid/class_proxyAccount.inc:152
+msgid "Max Data quota for the proxy"
+msgstr ""
diff --git a/ssh/locale/af_ZA/fusiondirectory.po b/ssh/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..c1bcb597637adc5c5b8c74d7d879e97d5335e115
--- /dev/null
+++ b/ssh/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,47 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/ssh/class_sshAccount.inc:58
+msgid "Upload error"
+msgstr ""
+
+#: personal/ssh/class_sshAccount.inc:58
+msgid "Unknown public key format!"
+msgstr ""
+
+#: personal/ssh/class_sshAccount.inc:81
+msgid "SSH Keys"
+msgstr ""
+
+#: personal/ssh/class_sshAccount.inc:87
+msgid "SSH public keys for this user"
+msgstr ""
+
+#: personal/ssh/class_sshAccount.inc:104
+msgid "SSH"
+msgstr ""
+
+#: personal/ssh/class_sshAccount.inc:105
+msgid "Edit user's SSH public keys"
+msgstr ""
+
+#: personal/ssh/class_sshAccount.inc:127
+#, php-format
+msgid "Error : there are several keys with fingerprint %s"
+msgstr ""
diff --git a/ssh/locale/ar/fusiondirectory.po b/ssh/locale/ar/fusiondirectory.po
index 940d0b0feb594e5c3bf3d61d9b10e6e313d4ff26..f836f30f68fbdf6799236fac8ebc6450c1c58f6d 100644
--- a/ssh/locale/ar/fusiondirectory.po
+++ b/ssh/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/ssh/locale/ca/fusiondirectory.po b/ssh/locale/ca/fusiondirectory.po
index a6c5afb816800db501690292b33600e041e9db3d..9e7c1c9697a39db03da0804934df1b11c6998fac 100644
--- a/ssh/locale/ca/fusiondirectory.po
+++ b/ssh/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/cs_CZ/fusiondirectory.po b/ssh/locale/cs_CZ/fusiondirectory.po
index ddea279545fb308ab1bea70ab0666d1340bc1484..fccbfe78c92d59dbd35d425f72d4e87638121f7d 100644
--- a/ssh/locale/cs_CZ/fusiondirectory.po
+++ b/ssh/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: personal/ssh/class_sshAccount.inc:58
 msgid "Upload error"
diff --git a/ssh/locale/de/fusiondirectory.po b/ssh/locale/de/fusiondirectory.po
index fbb92d17ff7cc4a90b969b803b66cc017a9f7731..f705b7610f252400e2360ed4dc2a70e036872c27 100644
--- a/ssh/locale/de/fusiondirectory.po
+++ b/ssh/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ssh/locale/el_GR/fusiondirectory.po b/ssh/locale/el_GR/fusiondirectory.po
index 45123064f533d49fdb0531bba58475be1cec10b3..2fea40f4fedac098119e69db5c63fa86997e8a10 100644
--- a/ssh/locale/el_GR/fusiondirectory.po
+++ b/ssh/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ssh/locale/es/fusiondirectory.po b/ssh/locale/es/fusiondirectory.po
index e5b128b2423163e5167192abc3c2781e2dc14093..8ade7286c484f7a0cc91cc2e8558f98e506dff2e 100644
--- a/ssh/locale/es/fusiondirectory.po
+++ b/ssh/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ssh/locale/es_CO/fusiondirectory.po b/ssh/locale/es_CO/fusiondirectory.po
index 4271edeebcf4e5abbaa0513a5b613655937794fc..5951bf5be64c26b1b2cad4c03467a6f40575de76 100644
--- a/ssh/locale/es_CO/fusiondirectory.po
+++ b/ssh/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/es_VE/fusiondirectory.po b/ssh/locale/es_VE/fusiondirectory.po
index b310118d134b572b62380582b8a2a093e20b284e..564fe06fdbd6ef9602bd6137b1c93f21f094bb77 100644
--- a/ssh/locale/es_VE/fusiondirectory.po
+++ b/ssh/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ssh/locale/fa_IR/fusiondirectory.po b/ssh/locale/fa_IR/fusiondirectory.po
index 749f27852c748920215b37fbea21e6a54d35792d..5b109c7362bd19fa0235c95749d67f5aff870229 100644
--- a/ssh/locale/fa_IR/fusiondirectory.po
+++ b/ssh/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: personal/ssh/class_sshAccount.inc:58
 msgid "Upload error"
diff --git a/ssh/locale/fi_FI/fusiondirectory.po b/ssh/locale/fi_FI/fusiondirectory.po
index 977658c7fe7f2de74849f23de048cc63e980e914..8d7249ca96a3d393eded5e591fd9bebdf6568c23 100644
--- a/ssh/locale/fi_FI/fusiondirectory.po
+++ b/ssh/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/fr/fusiondirectory.po b/ssh/locale/fr/fusiondirectory.po
index 37011808c5c239d5cdcf909d17053a215f24b8ba..4c6b3065fb42572dea5d31dc793d52bd038fd09d 100644
--- a/ssh/locale/fr/fusiondirectory.po
+++ b/ssh/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/ssh/locale/hu_HU/fusiondirectory.po b/ssh/locale/hu_HU/fusiondirectory.po
index 5bb7e3f751118bef5626ae2ca14674926822dc42..018100ee4dfe58cb3c0633703a0ca0473ec5141d 100644
--- a/ssh/locale/hu_HU/fusiondirectory.po
+++ b/ssh/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/id/fusiondirectory.po b/ssh/locale/id/fusiondirectory.po
index 7ba039daa041f5714825aca9bebf562ebf9c75c2..3f6be0afde2e7e83ed53a9f0879293badf35acba 100644
--- a/ssh/locale/id/fusiondirectory.po
+++ b/ssh/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/it_IT/fusiondirectory.po b/ssh/locale/it_IT/fusiondirectory.po
index baf61fa35d6e23c01aea2ba0b644621594f596b7..639ddfafc74bef58427e2290614d99a2fe37d499 100644
--- a/ssh/locale/it_IT/fusiondirectory.po
+++ b/ssh/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/ssh/locale/ja/fusiondirectory.po b/ssh/locale/ja/fusiondirectory.po
index d80e687bfb8858d06be3738160b9915b324b4210..6c1628f23130198087c12ca298edea724b319b11 100644
--- a/ssh/locale/ja/fusiondirectory.po
+++ b/ssh/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/ko/fusiondirectory.po b/ssh/locale/ko/fusiondirectory.po
index 543422acf06e09a71b695ff26c9b53e3705148e1..8a0527fc169bc195daebde980bd9796e878920c3 100644
--- a/ssh/locale/ko/fusiondirectory.po
+++ b/ssh/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/ssh/locale/lv/fusiondirectory.po b/ssh/locale/lv/fusiondirectory.po
index 03f7b38a2858310c9daab0db4c8a97ada5a71b7e..ebe77ae1b4c681bbbfec5b58264cc1a6ce0ba882 100644
--- a/ssh/locale/lv/fusiondirectory.po
+++ b/ssh/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/nb/fusiondirectory.po b/ssh/locale/nb/fusiondirectory.po
index fb0ec74e4411489f96fcacb59b8c17520051c4f1..1b5558244e60f711ae736c5300f59c405a93a021 100644
--- a/ssh/locale/nb/fusiondirectory.po
+++ b/ssh/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/nl/fusiondirectory.po b/ssh/locale/nl/fusiondirectory.po
index bf28aeaf062806d56f0cc207fc1e5ede39de3f97..98c72ba185a059b53bb08da089029813566bfb7b 100644
--- a/ssh/locale/nl/fusiondirectory.po
+++ b/ssh/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/ssh/locale/pl/fusiondirectory.po b/ssh/locale/pl/fusiondirectory.po
index 78af60657281549c16ef4740e78edb72f95f27e0..b177720cc7c448a08a908596b5cc083122a6f2f8 100644
--- a/ssh/locale/pl/fusiondirectory.po
+++ b/ssh/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ssh/locale/pt/fusiondirectory.po b/ssh/locale/pt/fusiondirectory.po
index d467ed2e1fa75e89053db8f345abd99e95870fc7..4f2b5fbe2dbd8dd736fea5539da00924df44dffb 100644
--- a/ssh/locale/pt/fusiondirectory.po
+++ b/ssh/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/pt_BR/fusiondirectory.po b/ssh/locale/pt_BR/fusiondirectory.po
index c4e7b9c1feeb67cab39f8c31c1f4f36c5b74a2cc..72b5fc522ce0dd8b9cf5d2320d3b6ef0b122f875 100644
--- a/ssh/locale/pt_BR/fusiondirectory.po
+++ b/ssh/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ssh/locale/ru/fusiondirectory.po b/ssh/locale/ru/fusiondirectory.po
index 3f7910c9b7fdb2011ca568d43828e9f9f0e97b7d..a8017391fbfd7b7e8d515de2b01ef111e4c5ae23 100644
--- a/ssh/locale/ru/fusiondirectory.po
+++ b/ssh/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/ssh/locale/ru@petr1708/fusiondirectory.po b/ssh/locale/ru@petr1708/fusiondirectory.po
index b730561b5e07242d8ac47c84c7ba2c4f0ff85c0d..9c3fab2ed2c0bacb17efe6d76c883a482618407e 100644
--- a/ssh/locale/ru@petr1708/fusiondirectory.po
+++ b/ssh/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/sv/fusiondirectory.po b/ssh/locale/sv/fusiondirectory.po
index 00b75321dd64992e3967530a5eacbc82cd8cade7..6c1e3c331ab2e2c297c5e931dc85f92d68834203 100644
--- a/ssh/locale/sv/fusiondirectory.po
+++ b/ssh/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/tr_TR/fusiondirectory.po b/ssh/locale/tr_TR/fusiondirectory.po
index b09bcd9af8ac962c58b1addd060e5de85a4e7d6e..7202c27090fade43709af6de6df3d797eb59ce1b 100644
--- a/ssh/locale/tr_TR/fusiondirectory.po
+++ b/ssh/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/ug/fusiondirectory.po b/ssh/locale/ug/fusiondirectory.po
index 33d29045a5b4c0bbb289e0ad9d98df020eb1ecce..90bb9b94d90459e012b9f5bc94ee0db3dd1ccd6b 100644
--- a/ssh/locale/ug/fusiondirectory.po
+++ b/ssh/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/vi_VN/fusiondirectory.po b/ssh/locale/vi_VN/fusiondirectory.po
index f4a05d52f82ca5f4d5b8cefd207f34e193a2a411..fae3b9ccb53587d46621902e31ed9cce1c87c14b 100644
--- a/ssh/locale/vi_VN/fusiondirectory.po
+++ b/ssh/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/zh/fusiondirectory.po b/ssh/locale/zh/fusiondirectory.po
index 0aa1bcd033a980c51fae067784b92d1b0e765999..3294ead5857dd9bde7c103f6b5f006c00ebafd68 100644
--- a/ssh/locale/zh/fusiondirectory.po
+++ b/ssh/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
diff --git a/ssh/locale/zh_TW/fusiondirectory.po b/ssh/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..a4435ba756c53c25a759d5ef8b2f6832c0b2548c
--- /dev/null
+++ b/ssh/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,47 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: personal/ssh/class_sshAccount.inc:58
+msgid "Upload error"
+msgstr ""
+
+#: personal/ssh/class_sshAccount.inc:58
+msgid "Unknown public key format!"
+msgstr ""
+
+#: personal/ssh/class_sshAccount.inc:81
+msgid "SSH Keys"
+msgstr ""
+
+#: personal/ssh/class_sshAccount.inc:87
+msgid "SSH public keys for this user"
+msgstr ""
+
+#: personal/ssh/class_sshAccount.inc:104
+msgid "SSH"
+msgstr ""
+
+#: personal/ssh/class_sshAccount.inc:105
+msgid "Edit user's SSH public keys"
+msgstr ""
+
+#: personal/ssh/class_sshAccount.inc:127
+#, php-format
+msgid "Error : there are several keys with fingerprint %s"
+msgstr ""
diff --git a/subcontracting/locale/af_ZA/fusiondirectory.po b/subcontracting/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..796ed51b148dfb1d1b4e8045c9d5316c6efc07f5
--- /dev/null
+++ b/subcontracting/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,70 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/subcontracting/class_subContracting.inc:33
+msgid "Subcontracting"
+msgstr ""
+
+#: personal/subcontracting/class_subContracting.inc:34
+msgid "Information needed for sub contracts"
+msgstr ""
+
+#: personal/subcontracting/class_subContracting.inc:47
+msgid "SubContracting Information"
+msgstr ""
+
+#: personal/subcontracting/class_subContracting.inc:50
+msgid "Intermediate"
+msgstr ""
+
+#: personal/subcontracting/class_subContracting.inc:51
+msgid "Contact to the final customer"
+msgstr ""
+
+#: personal/subcontracting/class_subContracting.inc:57
+msgid "Final Customer"
+msgstr ""
+
+#: personal/subcontracting/class_subContracting.inc:58
+msgid "Final Customer for this mission"
+msgstr ""
+
+#: personal/subcontracting/class_subContracting.inc:64
+msgid "Mail Address"
+msgstr ""
+
+#: personal/subcontracting/class_subContracting.inc:65
+msgid "Mail address assigned for this mission"
+msgstr ""
+
+#: personal/subcontracting/class_subContracting.inc:71
+msgid "Phone"
+msgstr ""
+
+#: personal/subcontracting/class_subContracting.inc:72
+msgid "Phone number assigned for this mission"
+msgstr ""
+
+#: personal/subcontracting/class_subContracting.inc:78
+msgid "Street Address"
+msgstr ""
+
+#: personal/subcontracting/class_subContracting.inc:79
+msgid "Address where this mission is executed"
+msgstr ""
diff --git a/subcontracting/locale/ar/fusiondirectory.po b/subcontracting/locale/ar/fusiondirectory.po
index 189d2ab2accbf676de94338420b6ee4fb34465a2..b3623666a3ce38759facaf69a025bd0f03f8b2f8 100644
--- a/subcontracting/locale/ar/fusiondirectory.po
+++ b/subcontracting/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/subcontracting/locale/ca/fusiondirectory.po b/subcontracting/locale/ca/fusiondirectory.po
index 06c70644bc1fb35e2c1ec32449c6f098187e7b04..1cdeb4a546c50bf3caba87d88a99941a909ca360 100644
--- a/subcontracting/locale/ca/fusiondirectory.po
+++ b/subcontracting/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/subcontracting/locale/cs_CZ/fusiondirectory.po b/subcontracting/locale/cs_CZ/fusiondirectory.po
index e67023b36fa50e5534033c7520f50f8c476db1cc..277c1047aadf8cfdd701f5fa09f1cc655c00a919 100644
--- a/subcontracting/locale/cs_CZ/fusiondirectory.po
+++ b/subcontracting/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
diff --git a/subcontracting/locale/de/fusiondirectory.po b/subcontracting/locale/de/fusiondirectory.po
index f1650e1f7aa2b9026a4cde42db67470684dd04ca..ca37e8adc8f6a27ec2f7f3b693cd0380fc15297d 100644
--- a/subcontracting/locale/de/fusiondirectory.po
+++ b/subcontracting/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/subcontracting/locale/el_GR/fusiondirectory.po b/subcontracting/locale/el_GR/fusiondirectory.po
index df2e42be5b06f3960e925c2826749f889e8ea98a..fddffa2665d6428c46108ee248c63a2f1e639fbf 100644
--- a/subcontracting/locale/el_GR/fusiondirectory.po
+++ b/subcontracting/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/subcontracting/locale/es/fusiondirectory.po b/subcontracting/locale/es/fusiondirectory.po
index 357f8c6348d8ea0caf449f58f4ac14bd9cdd6a3b..ecb5b04b4dd452ca9018c8d9c3d63e50bea11ec5 100644
--- a/subcontracting/locale/es/fusiondirectory.po
+++ b/subcontracting/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/subcontracting/locale/es_CO/fusiondirectory.po b/subcontracting/locale/es_CO/fusiondirectory.po
index 7c7f360f519f361df543a40829b066ca51e71919..b1124b3fd1e7c0e1703eee21eae6b38f2f908c45 100644
--- a/subcontracting/locale/es_CO/fusiondirectory.po
+++ b/subcontracting/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/subcontracting/locale/es_VE/fusiondirectory.po b/subcontracting/locale/es_VE/fusiondirectory.po
index 5b2e7377f039080ff295ab25d61c795f4c97014a..84549b43f20959602d151cf26abbc95c810f6f73 100644
--- a/subcontracting/locale/es_VE/fusiondirectory.po
+++ b/subcontracting/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/subcontracting/locale/fa_IR/fusiondirectory.po b/subcontracting/locale/fa_IR/fusiondirectory.po
index 5ba9dbba41a059e14ff99506a9f6d33df8e91776..fcfef67f96e7392c5c6eb291d059f39815317389 100644
--- a/subcontracting/locale/fa_IR/fusiondirectory.po
+++ b/subcontracting/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa_IR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
diff --git a/subcontracting/locale/fi_FI/fusiondirectory.po b/subcontracting/locale/fi_FI/fusiondirectory.po
index c555b30cac67bc4848e8adc3d8495158bba7167b..21b4629add18b4b5cdcd3f8e2e804fbf9635c43d 100644
--- a/subcontracting/locale/fi_FI/fusiondirectory.po
+++ b/subcontracting/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/subcontracting/locale/fr/fusiondirectory.po b/subcontracting/locale/fr/fusiondirectory.po
index 3ddd12b01280215951dfee6f00dca039f171d9d5..aec3c21a7b1f710e377184a8f415d7c5bf6921c0 100644
--- a/subcontracting/locale/fr/fusiondirectory.po
+++ b/subcontracting/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/subcontracting/locale/hu_HU/fusiondirectory.po b/subcontracting/locale/hu_HU/fusiondirectory.po
index bdbd82d901294ad69ccf1de6d699375b4e5af81d..7a3a580e6296d947d64a84714b1ede461e3f6445 100644
--- a/subcontracting/locale/hu_HU/fusiondirectory.po
+++ b/subcontracting/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/subcontracting/locale/id/fusiondirectory.po b/subcontracting/locale/id/fusiondirectory.po
index 4c24ff072e011e7fe03dba8519c461f7465b26ab..8f7c10391cec49cf6a0ab4d03b4505ab6092e337 100644
--- a/subcontracting/locale/id/fusiondirectory.po
+++ b/subcontracting/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/subcontracting/locale/it_IT/fusiondirectory.po b/subcontracting/locale/it_IT/fusiondirectory.po
index 9b7f63111a8b4d74658d21d4ec3dc33fe4626980..8903e8713ccfbeebb650821c94a2f04247fd4290 100644
--- a/subcontracting/locale/it_IT/fusiondirectory.po
+++ b/subcontracting/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/subcontracting/locale/ja/fusiondirectory.po b/subcontracting/locale/ja/fusiondirectory.po
index 22345c500f61ae1d5374d614aff39afb5f8b02f1..92898bcc7f8df6bccbddc068a38389096bdf13ac 100644
--- a/subcontracting/locale/ja/fusiondirectory.po
+++ b/subcontracting/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/subcontracting/locale/ko/fusiondirectory.po b/subcontracting/locale/ko/fusiondirectory.po
index 252cfade9a7ee535dd3e8b29d00b6789b24cc7f3..86c1f60caafaf999f70a4eec0249c67c00fd2421 100644
--- a/subcontracting/locale/ko/fusiondirectory.po
+++ b/subcontracting/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/subcontracting/locale/lv/fusiondirectory.po b/subcontracting/locale/lv/fusiondirectory.po
index 21fbcb568cdf2572ac27664f950961420de8e65d..725171cc8c0077de28b53a04b341c9915a1648e7 100644
--- a/subcontracting/locale/lv/fusiondirectory.po
+++ b/subcontracting/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/subcontracting/locale/nb/fusiondirectory.po b/subcontracting/locale/nb/fusiondirectory.po
index 1b1d76f6df27e34be90df53ed1ec4bade6ed3d13..52159d0dc1e55393b8d99c691ea7688b326db6a0 100644
--- a/subcontracting/locale/nb/fusiondirectory.po
+++ b/subcontracting/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/subcontracting/locale/nl/fusiondirectory.po b/subcontracting/locale/nl/fusiondirectory.po
index e6f5a5df0d0fba6845962692d82d3aed1680fbe2..269963e7cbd6aa34c93d6553148bf7a08333ff17 100644
--- a/subcontracting/locale/nl/fusiondirectory.po
+++ b/subcontracting/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/subcontracting/locale/pl/fusiondirectory.po b/subcontracting/locale/pl/fusiondirectory.po
index 2706b3330e0ae730a939784a9f53e6eb9b250908..3728f5a4f147ad7051a83cc73e4b6a356fe681cd 100644
--- a/subcontracting/locale/pl/fusiondirectory.po
+++ b/subcontracting/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/subcontracting/locale/pt/fusiondirectory.po b/subcontracting/locale/pt/fusiondirectory.po
index 1ba45b448985086d014acf8424026a9e1293074a..bba66a7ee7f14837efdb6896835c5cb43cd2a1b3 100644
--- a/subcontracting/locale/pt/fusiondirectory.po
+++ b/subcontracting/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/subcontracting/locale/pt_BR/fusiondirectory.po b/subcontracting/locale/pt_BR/fusiondirectory.po
index e4d4c918d63fd2841fdde69b5fb36142b91f728c..882d9f58bde8032616237a520e49c6ca4aba8aff 100644
--- a/subcontracting/locale/pt_BR/fusiondirectory.po
+++ b/subcontracting/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/subcontracting/locale/ru/fusiondirectory.po b/subcontracting/locale/ru/fusiondirectory.po
index 7a3ba5b7755e80f98df95c6dc7bd95f633ff953d..70dc6638e9e2acb78d38f1d624f6e1e44d31a752 100644
--- a/subcontracting/locale/ru/fusiondirectory.po
+++ b/subcontracting/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/subcontracting/locale/ru@petr1708/fusiondirectory.po b/subcontracting/locale/ru@petr1708/fusiondirectory.po
index a0753f969cb4411ff4a6b3824bc0c89cf7b0a71c..7bc0ba165e9bfaa803119dce0bd742b6d4191f21 100644
--- a/subcontracting/locale/ru@petr1708/fusiondirectory.po
+++ b/subcontracting/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/subcontracting/locale/sv/fusiondirectory.po b/subcontracting/locale/sv/fusiondirectory.po
index 01de33777c3c8148d2fdcb62d397e95e9c47d3ee..98bec96ba4c59ecdb5380814bf5881943816bbf9 100644
--- a/subcontracting/locale/sv/fusiondirectory.po
+++ b/subcontracting/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/subcontracting/locale/tr_TR/fusiondirectory.po b/subcontracting/locale/tr_TR/fusiondirectory.po
index 2cf9f8b4a8149ebbf3e913b9b9127b19ec4750e3..94d1bbf4b48758a90d064f88db8f2066a92d844e 100644
--- a/subcontracting/locale/tr_TR/fusiondirectory.po
+++ b/subcontracting/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/subcontracting/locale/ug/fusiondirectory.po b/subcontracting/locale/ug/fusiondirectory.po
index 9ddf48a98433380c334f39dc63fdc4a557e78a4f..279a9dc7f793e06f9b7dfb7266e333d23b028988 100644
--- a/subcontracting/locale/ug/fusiondirectory.po
+++ b/subcontracting/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/subcontracting/locale/vi_VN/fusiondirectory.po b/subcontracting/locale/vi_VN/fusiondirectory.po
index 6d5234266a93e252dde9ab4440c1349bd1fa9b40..afda6a8b615d75fde7bd99a06ebc36363a405f50 100644
--- a/subcontracting/locale/vi_VN/fusiondirectory.po
+++ b/subcontracting/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/subcontracting/locale/zh/fusiondirectory.po b/subcontracting/locale/zh/fusiondirectory.po
index 955aa394b88e2f10175e28bc0783ee97abde05cf..3ff5eda5f0a54f9a42faaf4aa05097c4acf80224 100644
--- a/subcontracting/locale/zh/fusiondirectory.po
+++ b/subcontracting/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/subcontracting/locale/zh_TW/fusiondirectory.po b/subcontracting/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..9126e7e25215201787732346289a19c4e898798b
--- /dev/null
+++ b/subcontracting/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,70 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: personal/subcontracting/class_subContracting.inc:33
+msgid "Subcontracting"
+msgstr ""
+
+#: personal/subcontracting/class_subContracting.inc:34
+msgid "Information needed for sub contracts"
+msgstr ""
+
+#: personal/subcontracting/class_subContracting.inc:47
+msgid "SubContracting Information"
+msgstr ""
+
+#: personal/subcontracting/class_subContracting.inc:50
+msgid "Intermediate"
+msgstr ""
+
+#: personal/subcontracting/class_subContracting.inc:51
+msgid "Contact to the final customer"
+msgstr ""
+
+#: personal/subcontracting/class_subContracting.inc:57
+msgid "Final Customer"
+msgstr ""
+
+#: personal/subcontracting/class_subContracting.inc:58
+msgid "Final Customer for this mission"
+msgstr ""
+
+#: personal/subcontracting/class_subContracting.inc:64
+msgid "Mail Address"
+msgstr ""
+
+#: personal/subcontracting/class_subContracting.inc:65
+msgid "Mail address assigned for this mission"
+msgstr ""
+
+#: personal/subcontracting/class_subContracting.inc:71
+msgid "Phone"
+msgstr ""
+
+#: personal/subcontracting/class_subContracting.inc:72
+msgid "Phone number assigned for this mission"
+msgstr ""
+
+#: personal/subcontracting/class_subContracting.inc:78
+msgid "Street Address"
+msgstr ""
+
+#: personal/subcontracting/class_subContracting.inc:79
+msgid "Address where this mission is executed"
+msgstr ""
diff --git a/sudo/locale/af_ZA/fusiondirectory.po b/sudo/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..744d84b1e435ad3dee004db9a932f4f3b79204a5
--- /dev/null
+++ b/sudo/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,156 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:123
+#: config/sudo/class_sudoConfig.inc:42
+msgid "Sudo"
+msgstr ""
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
+msgid "Sudo role"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:154
+msgid "Role settings"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:160
+msgid "Name"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:160
+msgid "Name of the role"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:165
+msgid "Description"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:165
+msgid "Description for the new sudo role"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:170
+msgid "Commands"
+msgstr ""
+
+#: 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:177
+msgid "Run as (user)"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:178
+msgid "User(s) impersonated by sudo"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:185
+msgid "Run as (group)"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:186
+msgid "Group(s) impersonated by sudo"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:192
+msgid "Systems"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:192
+msgid "A host name, IP address or IP network"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:197
+msgid "Users and groups"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:198
+msgid ""
+"A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:202
+msgid "Priority"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:202
+msgid "This rule priority compared to others"
+msgstr ""
+
+#: admin/sudo/class_sudoOption.inc:77
+msgid "Unknown option"
+msgstr ""
+
+#: admin/sudo/class_sudoOption.inc:78
+#, php-format
+msgid "The sudo option '%s' is invalid!"
+msgstr ""
+
+#: admin/sudo/class_sudoOption.inc:273
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: admin/sudo/class_sudoOption.inc:476
+msgid "Available options"
+msgstr ""
+
+#: admin/sudo/class_sudoOption.inc:479
+msgid "Option"
+msgstr ""
+
+#: admin/sudo/class_sudoOption.inc:479
+msgid "Add a new sudo option"
+msgstr ""
+
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
+msgid "Used sudo role options"
+msgstr ""
+
+#: admin/sudo/class_sudoOption.inc:553
+msgid "Options"
+msgstr ""
+
+#: admin/sudo/class_sudoOption.inc:554
+msgid "Sudo options"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr ""
diff --git a/sudo/locale/ar/fusiondirectory.po b/sudo/locale/ar/fusiondirectory.po
index 0b9d6fe8f336ab351cdd6e9be5aac6cabf8acdcb..a6f3acea2e03f24f287a8f0aa70d72e1c481cb45 100644
--- a/sudo/locale/ar/fusiondirectory.po
+++ b/sudo/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/sudo/locale/ca/fusiondirectory.po b/sudo/locale/ca/fusiondirectory.po
index c58c57a05f6fbbad5b6ec1be2083e3a9eda213dc..97698eabe0265222aae1f2fcf6c5c2b77edca601 100644
--- a/sudo/locale/ca/fusiondirectory.po
+++ b/sudo/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/sudo/locale/cs_CZ/fusiondirectory.po b/sudo/locale/cs_CZ/fusiondirectory.po
index a478cda9eeb6e0238af3aa6b609b684498cb2153..82c0cf5eb2f66bbb0d1bb1fcaeb599ea47bef4f7 100644
--- a/sudo/locale/cs_CZ/fusiondirectory.po
+++ b/sudo/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:123
 #: config/sudo/class_sudoConfig.inc:42
diff --git a/sudo/locale/de/fusiondirectory.po b/sudo/locale/de/fusiondirectory.po
index e915c1ac5887cadc55034c414ebc6cea05c962a4..cffcc1761d9d195e2ac6be941f5db85c9ee9c85b 100644
--- a/sudo/locale/de/fusiondirectory.po
+++ b/sudo/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sudo/locale/el_GR/fusiondirectory.po b/sudo/locale/el_GR/fusiondirectory.po
index 73d7edb3d6710a5dc1c6b7ac4e1caf00692a061a..8231647583af3f8c21c1c91fa781c5c6d0aea725 100644
--- a/sudo/locale/el_GR/fusiondirectory.po
+++ b/sudo/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sudo/locale/es/fusiondirectory.po b/sudo/locale/es/fusiondirectory.po
index b671ec9d8215aa411f5d0e8131fde0a5b64a955d..9f028207e03876b833926ac1a7c2114df8990666 100644
--- a/sudo/locale/es/fusiondirectory.po
+++ b/sudo/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sudo/locale/es_CO/fusiondirectory.po b/sudo/locale/es_CO/fusiondirectory.po
index 6c6985aef88511ee88cd2895be84b614bd844e0d..9d2dba1e977a1c3bf5a4379d7873fa5a3edc42a8 100644
--- a/sudo/locale/es_CO/fusiondirectory.po
+++ b/sudo/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sudo/locale/es_VE/fusiondirectory.po b/sudo/locale/es_VE/fusiondirectory.po
index e62c3a35e0b0ada6b1bd23c3325688b6e77af872..effbb15b6948cd3f73f33e8c78aca187f937735c 100644
--- a/sudo/locale/es_VE/fusiondirectory.po
+++ b/sudo/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sudo/locale/fa_IR/fusiondirectory.po b/sudo/locale/fa_IR/fusiondirectory.po
index c973246626c14833185a0f8f55bd2a454f3fb108..4a658967a151e4d1573dbeb9935805222d35823a 100644
--- a/sudo/locale/fa_IR/fusiondirectory.po
+++ b/sudo/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:123
 #: config/sudo/class_sudoConfig.inc:42
diff --git a/sudo/locale/fi_FI/fusiondirectory.po b/sudo/locale/fi_FI/fusiondirectory.po
index fec15faee96315d7022569365d4de6e835f3cb14..5d02ff79a8679ea5e73c7466bf3115a76b9372ac 100644
--- a/sudo/locale/fi_FI/fusiondirectory.po
+++ b/sudo/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/sudo/locale/fr/fusiondirectory.po b/sudo/locale/fr/fusiondirectory.po
index 56a218a7f38fe71007c9025dceb272d8179f766b..91c546b21e38a3ad0e0ada5007a08a86f2c3e84b 100644
--- a/sudo/locale/fr/fusiondirectory.po
+++ b/sudo/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/sudo/locale/hu_HU/fusiondirectory.po b/sudo/locale/hu_HU/fusiondirectory.po
index 1145688a0fbff0773657f691cd52a9c5c5c7f2a9..4d72b3704df9850172a51b669cf46656d32e8b1e 100644
--- a/sudo/locale/hu_HU/fusiondirectory.po
+++ b/sudo/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/sudo/locale/id/fusiondirectory.po b/sudo/locale/id/fusiondirectory.po
index b8b0f9f33b98d43db50f897d406f8088182975ce..409da66e3ea329ec9856f21986c8316a5409cc0d 100644
--- a/sudo/locale/id/fusiondirectory.po
+++ b/sudo/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sudo/locale/it_IT/fusiondirectory.po b/sudo/locale/it_IT/fusiondirectory.po
index 8b4a2c5bdf56be91217d1c3e1424901836e5190d..af713114e345564150e5860c005a59c7e53d4c0e 100644
--- a/sudo/locale/it_IT/fusiondirectory.po
+++ b/sudo/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/sudo/locale/ja/fusiondirectory.po b/sudo/locale/ja/fusiondirectory.po
index bc46b15a183c20bc2de29662abfe2ad6d1bf1e01..4bf20c3377355f288aef8a9f4fe58052e0d1229d 100644
--- a/sudo/locale/ja/fusiondirectory.po
+++ b/sudo/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sudo/locale/ko/fusiondirectory.po b/sudo/locale/ko/fusiondirectory.po
index f60112e221ff9e78850e2b103ff65dc4a1425cf1..d8465055330b7c7aee1112d7644b918f6e438e6c 100644
--- a/sudo/locale/ko/fusiondirectory.po
+++ b/sudo/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/sudo/locale/lv/fusiondirectory.po b/sudo/locale/lv/fusiondirectory.po
index 6626cbf4c5661249124b8ae2c7f90dc874ef1046..1a69edf8cd7e94258da230a0097df6381736eb86 100644
--- a/sudo/locale/lv/fusiondirectory.po
+++ b/sudo/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/sudo/locale/nb/fusiondirectory.po b/sudo/locale/nb/fusiondirectory.po
index 453026ab9a6bdd693b7490e3ec9d70e175cda581..fd110ab80ff63bf051b7a0858bf2259521d0d2df 100644
--- a/sudo/locale/nb/fusiondirectory.po
+++ b/sudo/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/sudo/locale/nl/fusiondirectory.po b/sudo/locale/nl/fusiondirectory.po
index 3d24963a2ba4be08115ae66a7542db96db4f829f..8a1b18a0134a40a48d631066723d9e380fcc74df 100644
--- a/sudo/locale/nl/fusiondirectory.po
+++ b/sudo/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Lucien Antonissen <lucien.antonissen@digipolis.be>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/sudo/locale/pl/fusiondirectory.po b/sudo/locale/pl/fusiondirectory.po
index 5b84af0ad121b5a3a4f4ad5dd25fdafd33f4afd8..b8715dba1938dd24522afcefd430cfe1149165ea 100644
--- a/sudo/locale/pl/fusiondirectory.po
+++ b/sudo/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sudo/locale/pt/fusiondirectory.po b/sudo/locale/pt/fusiondirectory.po
index 1a031fb09da3b40ceca9a533b9c71ef5a7fc8061..1d454b5a6c190330eca977c761240c84f3dcfdff 100644
--- a/sudo/locale/pt/fusiondirectory.po
+++ b/sudo/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/sudo/locale/pt_BR/fusiondirectory.po b/sudo/locale/pt_BR/fusiondirectory.po
index 44cbdc31ae5a0c01960de2eef497fcdfe8d81751..cd8c7ca215f8c2d247450d67e513cab5d592f3ed 100644
--- a/sudo/locale/pt_BR/fusiondirectory.po
+++ b/sudo/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sudo/locale/ru/fusiondirectory.po b/sudo/locale/ru/fusiondirectory.po
index de24c8e97d11bfda0f5052e2c25c9a6ebf42a843..9e9174ed86437be900fae9aa1a9187171feedd71 100644
--- a/sudo/locale/ru/fusiondirectory.po
+++ b/sudo/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sudo/locale/ru@petr1708/fusiondirectory.po b/sudo/locale/ru@petr1708/fusiondirectory.po
index d6dde74dab887fe6f7d31140843c7abf4e041802..1e27f9c3e293dfd52f21c4782d122cf63770afee 100644
--- a/sudo/locale/ru@petr1708/fusiondirectory.po
+++ b/sudo/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sudo/locale/sv/fusiondirectory.po b/sudo/locale/sv/fusiondirectory.po
index 3ae9240879280695bd17514488aefda2142490e1..71707ce766c0ea609f1ddb0897291c84aa40a781 100644
--- a/sudo/locale/sv/fusiondirectory.po
+++ b/sudo/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sudo/locale/tr_TR/fusiondirectory.po b/sudo/locale/tr_TR/fusiondirectory.po
index 16391c43a153833bc4840ed26c8779c3ff1aebd3..f8b92e21d6b4436e0771e841d175367fc05df6cd 100644
--- a/sudo/locale/tr_TR/fusiondirectory.po
+++ b/sudo/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sudo/locale/ug/fusiondirectory.po b/sudo/locale/ug/fusiondirectory.po
index e74dc5ba41627188d6c2b98e78bc48c57bbb1c1f..e216897459b7a662218d5b0ff3497762bd866ca5 100644
--- a/sudo/locale/ug/fusiondirectory.po
+++ b/sudo/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sudo/locale/vi_VN/fusiondirectory.po b/sudo/locale/vi_VN/fusiondirectory.po
index 689877222c20a42641f2f4b6c4290f32ae032c22..49d45b108138aa165cddcb85dceac3cc36fb7539 100644
--- a/sudo/locale/vi_VN/fusiondirectory.po
+++ b/sudo/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/sudo/locale/zh/fusiondirectory.po b/sudo/locale/zh/fusiondirectory.po
index 0e0dc57c515602c2ee68674d4bf8b55218d56c02..5c54598a666ed9aac0a4cba511fc6b72620c98ca 100644
--- a/sudo/locale/zh/fusiondirectory.po
+++ b/sudo/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sudo/locale/zh_TW/fusiondirectory.po b/sudo/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..dfbce139faefa27e1fc275fa4b6bcfa0df58c333
--- /dev/null
+++ b/sudo/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,156 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/sudo/class_sudoManagement.inc:32 admin/sudo/class_sudoGeneric.inc:123
+#: config/sudo/class_sudoConfig.inc:42
+msgid "Sudo"
+msgstr ""
+
+#: admin/sudo/class_sudoManagement.inc:33
+msgid "Sudo management"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
+msgid "Sudo role"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:154
+msgid "Role settings"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:160
+msgid "Name"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:160
+msgid "Name of the role"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:165
+msgid "Description"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:165
+msgid "Description for the new sudo role"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:170
+msgid "Commands"
+msgstr ""
+
+#: 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:177
+msgid "Run as (user)"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:178
+msgid "User(s) impersonated by sudo"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:185
+msgid "Run as (group)"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:186
+msgid "Group(s) impersonated by sudo"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:192
+msgid "Systems"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:192
+msgid "A host name, IP address or IP network"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:197
+msgid "Users and groups"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:198
+msgid ""
+"A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:202
+msgid "Priority"
+msgstr ""
+
+#: admin/sudo/class_sudoGeneric.inc:202
+msgid "This rule priority compared to others"
+msgstr ""
+
+#: admin/sudo/class_sudoOption.inc:77
+msgid "Unknown option"
+msgstr ""
+
+#: admin/sudo/class_sudoOption.inc:78
+#, php-format
+msgid "The sudo option '%s' is invalid!"
+msgstr ""
+
+#: admin/sudo/class_sudoOption.inc:273
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: admin/sudo/class_sudoOption.inc:476
+msgid "Available options"
+msgstr ""
+
+#: admin/sudo/class_sudoOption.inc:479
+msgid "Option"
+msgstr ""
+
+#: admin/sudo/class_sudoOption.inc:479
+msgid "Add a new sudo option"
+msgstr ""
+
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
+msgid "Used sudo role options"
+msgstr ""
+
+#: admin/sudo/class_sudoOption.inc:553
+msgid "Options"
+msgstr ""
+
+#: admin/sudo/class_sudoOption.inc:554
+msgid "Sudo options"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:28
+msgid "Sudo configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:29
+msgid "FusionDirectory sudo plugin configuration"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Sudo RDN"
+msgstr ""
+
+#: config/sudo/class_sudoConfig.inc:45
+msgid "Branch in which sudoers will be stored"
+msgstr ""
diff --git a/supann/admin/supannStructures/class_entite.inc b/supann/admin/supannStructures/class_entite.inc
index 8e8a4c526a3ef75819cb43368dfba649fbbe716c..63884fa72850eefd4389ed0a1cd7fce027c05561 100644
--- a/supann/admin/supannStructures/class_entite.inc
+++ b/supann/admin/supannStructures/class_entite.inc
@@ -88,7 +88,7 @@ class entite extends simplePlugin
           new StringAttribute(
             _('Entity code'), _('The SUPANN code of this entity'),
             'supannCodeEntite', TRUE,
-            '', '', '/^[a-z0-9_-]*$/'.(strict_uid_mode()?'':'i')
+            '', '', '/^[a-z0-9_-]*$/i'
           ),
           new SelectAttribute(
             _('Parent entity'), _('The parent entity of this entity'),
diff --git a/supann/admin/supannStructures/class_etablissement.inc b/supann/admin/supannStructures/class_etablissement.inc
index 2b7d3a0e3c68b5a1892e5883209faf8ade8a97d6..c56057ee1445cf14288306a5dbf781bf7f1f2c51 100644
--- a/supann/admin/supannStructures/class_etablissement.inc
+++ b/supann/admin/supannStructures/class_etablissement.inc
@@ -97,7 +97,7 @@ class etablissement extends simplePlugin
           new StringAttribute(
             _('SUPANN code'), _('The SUPANN code for this Establishment'),
             'supannCodeEntite', TRUE,
-            '', '', '/^[a-z0-9_-]*$/'.(strict_uid_mode()?'':'i')
+            '', '', '/^[a-z0-9_-]*$/i'
           ),
           new StringAttribute(
             _('Legal name'), _('The legal name of this Establishment'),
diff --git a/supann/contrib/etc/affiliation b/supann/contrib/etc/affiliation
index 90512bc4af9f22b02edec3f32a6a079dba1bed13..df566d7bae0150e1ab12c9bbe3a94f72e8784300 100644
--- a/supann/contrib/etc/affiliation
+++ b/supann/contrib/etc/affiliation
@@ -1,15 +1,15 @@
 # nomenclature eduPerson + supann
 # http://www.cru.fr/documentation/supann/2009/documentcomplet#edupersonaffiliation
-student;Personnel en formation
-faculty;Personnel pédagogique
-staff;Personnel non pédagogique
-employee;Personnel rémunéré
-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
-researcher;Personnel Chercheur
-retired;Personnel à la retraite gardant des relations avec l'établissement
-emeritus;Personnel ayant l'éméritat
-teacher;Personnel ayant une activité de recherche
-registered-reader;Lecteur autorisé à la bibliothèque
+student;Personne en formation (student)
+faculty;Personnel pédagogique (faculty)
+staff;Personnel non pédagogique (staff)
+employee;Personnel rémunéré (employee)
+member;Personne interne à l'établissement (member)
+affiliate;Personne externe à l'établissement (affiliate)
+alum;Ancien étudiant gardant des relations avec l'établissement (alum)
+library-walk-in;Lecteur autorisé à la bibliothèque (obsolète - library-walk-in)
+researcher;Personnel assurant une activité de recherche (researcher)
+retired;Personne à la retraite gardant des relations avec l'établissement (retired)
+emeritus;Professeur ayant obtenu l'éméritat (emeritus)
+teacher;Personnel assurant une activité d'enseignement (teacher)
+registered-reader;Lecteur autorisé à la bibliothèque (registered-reader)
diff --git a/supann/locale/af_ZA/fusiondirectory.po b/supann/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..28981cf9cea0a155a55b298ea4aed1b611880565
--- /dev/null
+++ b/supann/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,653 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/supannStructures/class_etablissement.inc:31
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
+msgid "Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Root Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Set this Establishment as the root one"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:59
+#: admin/supannStructures/class_entite.inc:55
+msgid "Name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:59
+msgid "The name to write in the o attribute for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:63
+#: admin/supannStructures/class_entite.inc:76
+msgid "Description"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:63
+msgid "A short description of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:69
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Location"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Usually the city where this Establishment is"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "The postal address of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:80
+#: admin/supannStructures/class_entite.inc:64
+msgid "Telephone"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:80
+msgid "Phone number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:84
+#: admin/supannStructures/class_entite.inc:68
+msgid "Fax"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "Establishment code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "The code of this Establishment (must have a prefix between {})"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "SUPANN code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
+msgid "LDAP error"
+msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:31
+#: admin/supannStructures/class_entite.inc:52
+msgid "Entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:32
+msgid "SUPANN Entity Settings"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:35
+msgid "SUPANN Entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:55
+msgid "The name to write in the ou attribute for this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:61
+msgid "Administrative information"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:64
+msgid "Phone number for this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:68
+msgid "Fax number for this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:72
+msgid "Postal address"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:72
+msgid "Postal address of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:76
+msgid "Short description of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:82
+msgid "SUPANN information"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:99
+msgid "Reference IDs"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:99
+msgid "supannRefId - IDs/links for this entity on other systems"
+msgstr ""
+
+#: config/supann/class_supannConfig.inc:28
+msgid "SUPANN configuration"
+msgstr ""
+
+#: config/supann/class_supannConfig.inc:29
+msgid "FusionDirectory SUPANN plugin configuration"
+msgstr ""
+
+#: config/supann/class_supannConfig.inc:41
+msgid "SUPANN"
+msgstr ""
+
+#: config/supann/class_supannConfig.inc:44
+msgid "SUPANN RDN"
+msgstr ""
+
+#: config/supann/class_supannConfig.inc:44
+msgid "Branch in which SUPANN structures will be stored"
+msgstr ""
+
+#: config/supann/class_supannConfig.inc:49
+msgid "SUPANN mail for recovery"
+msgstr ""
+
+#: config/supann/class_supannConfig.inc:49
+msgid ""
+"Allow the use of mail addresses from the personal mail address field from "
+"SUPANN account for password recovery"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:36
+#: personal/supann/class_supannAccount.inc:111
+msgid "None"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:108
+msgid "Licence"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:108
+msgid "Master"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:108
+msgid "Ph.D."
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:108
+msgid "Another class of degree"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:108
+msgid "post-graduate year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:111
+msgid "1st year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:111
+msgid "2nd year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:111
+msgid "3rd year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:112
+msgid "4th year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:112
+msgid "5th year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:112
+msgid "6th year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:113
+msgid "7th year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:113
+msgid "8th year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:113
+msgid "9th year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:216
+msgid "SupAnn"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:217
+msgid "SupAnn information management plugin"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:234
+msgid "Identity"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:237
+msgid "Civilite"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:237
+msgid "supannCivilite - Civility for this person"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:242
+msgid "Alias login"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:242
+msgid "supannAliasLogin - An alias for the login of this user"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:246
+msgid "eduPersonPrincipalName"
+msgstr ""
+
+#: 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:250
+msgid "Nick name"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:250
+msgid "eduPersonNickname - Can contain a nick name for this user"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:255
+msgid "Ref ids"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:255
+msgid "supannRefId - IDs/links for this user on other systems"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:265
+msgid "Contact"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:269
+msgid "Other phone numbers"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:269
+msgid "supannAutreTelephone - Other phone numbers for this user"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:275
+msgid "Other mail addresses"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:275
+msgid ""
+"supannAutreMail - Other mail addresses for this user. Each must be unique"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:281
+msgid "Personal mail addresses"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:281
+msgid "supannMailPerso - Personal mail addresses for this user"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:286
+msgid "red List"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:286
+msgid "supannListeRouge - Should this person be on the red list"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:292
+msgid "Affectation"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:295
+msgid "Entity primary assignment"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:295
+msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
+msgstr ""
+
+#: 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: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:306
+msgid "Entity type assignment"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
+msgid "supannTypeEntiteAffectation"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:313
+msgid "Affiliation"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:316
+msgid "Primary affiliation"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:316
+msgid "eduPersonPrimaryAffiliation - Main status of the person"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:321
+msgid "Affiliations"
+msgstr ""
+
+#: 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:327
+msgid ""
+"supannEtablissement - institution or unit of administrative attachment of "
+"the person"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:334
+msgid "Student profile"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:337
+msgid "INE code"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:337
+msgid "supannCodeINE - INE code of this student"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:341
+msgid "Student ID"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:341
+msgid "supannEtuId - Scolarity id"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:347
+msgid "Student subscriptions"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:362
+msgid "supannEtuInscription - Subscriptions for this student"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:366
+msgid ""
+"supannEtablissement - Etablissement in which this subscription was done"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:370
+msgid "Year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:370
+msgid "supannEtuAnneeInscription - The year this subscription will begin"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:375
+msgid "Subscription type"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:375
+msgid "supannEtuRegimeInscription - The type of this subscription"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:379
+msgid "Disciplinary Sector"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:379
+msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:383
+msgid "Diploma type"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:383
+msgid "supannEtuTypeDiplome - Type of diploma"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:387
+msgid "Curriculum year "
+msgstr ""
+
+#: 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:391
+msgid "supannEntiteAffectation_affect"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:395
+msgid "Diploma"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:395
+msgid "supannEtuDiplome - Diploma prepared by the student"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:399
+msgid "Step"
+msgstr ""
+
+#: 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:403
+msgid "educational element"
+msgstr ""
+
+#: 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:417
+msgid "Personal profile"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:420
+msgid "Personal ID"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:420
+msgid "supannEmpId - Employee identifier"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:424
+msgid "Personal corps"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:424
+msgid "supannEmpCorps"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:429
+msgid "Activity"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:429
+msgid "supannActivite - category of profession"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:436
+msgid "Roles"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:443
+msgid "supannRoleEntite"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:447
+msgid "Generic role"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:447
+msgid "supannRoleGenerique - Generics Roles of the person in the facility"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:451
+msgid "Entity assignment type"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/ar/fusiondirectory.po b/supann/locale/ar/fusiondirectory.po
index 29c249f14fbb7afa8b0fe18e0d1a6f32c86cc43d..91e870b06ce506f7ede398f8d4014d97fa1e7b82 100644
--- a/supann/locale/ar/fusiondirectory.po
+++ b/supann/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -646,3 +646,9 @@ msgstr ""
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/ca/fusiondirectory.po b/supann/locale/ca/fusiondirectory.po
index 60f306b0942ac2c5f312479f09f36cc2d6ae86fd..8623cd0edd5ff7a5b0672d598db52d10de6b10ee 100644
--- a/supann/locale/ca/fusiondirectory.po
+++ b/supann/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -646,3 +646,9 @@ msgstr ""
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/cs_CZ/fusiondirectory.po b/supann/locale/cs_CZ/fusiondirectory.po
index 3da18a9dff18cbeb56e5a5547224c140ed7763a5..facd56e3500303ac60d67ac595e1ee90c8f5ba9d 100644
--- a/supann/locale/cs_CZ/fusiondirectory.po
+++ b/supann/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/supannStructures/class_etablissement.inc:31
 #: personal/supann/class_supannAccount.inc:327
@@ -669,3 +669,9 @@ msgstr "supannRoleGenerique – obecné role této osoby v zařízení"
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr "Typ přiřazení entity"
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/de/fusiondirectory.po b/supann/locale/de/fusiondirectory.po
index 7f52aa09956a2c70d8feb097a51d9bff74c9d8a5..7c27220b7a41dba9c8cac2c023583ee0f5ca30e1 100644
--- a/supann/locale/de/fusiondirectory.po
+++ b/supann/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -646,3 +646,9 @@ msgstr ""
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr "Einheitszuordnungstyp"
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/el_GR/fusiondirectory.po b/supann/locale/el_GR/fusiondirectory.po
index e145eb4c52be66e35f74012040928e2a6c3c9a57..9a93f48f89af966dff849792cd752d76b1ee6bcd 100644
--- a/supann/locale/el_GR/fusiondirectory.po
+++ b/supann/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -647,3 +647,9 @@ msgstr ""
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr "Τύπος ανάθεσης οντότητας"
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/es/fusiondirectory.po b/supann/locale/es/fusiondirectory.po
index 939b7a58f864aee73454bf891f6357b515d54fba..918b2ce5fe96b5443de36b6c32a333c74dab264f 100644
--- a/supann/locale/es/fusiondirectory.po
+++ b/supann/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -646,3 +646,9 @@ msgstr ""
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/es_CO/fusiondirectory.po b/supann/locale/es_CO/fusiondirectory.po
index af834dd9f7a37adabbb507c5e4d119a16b5d01d2..d75be9bdaa496d80b5d862a662b32bcf76658634 100644
--- a/supann/locale/es_CO/fusiondirectory.po
+++ b/supann/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -646,3 +646,9 @@ msgstr ""
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/es_VE/fusiondirectory.po b/supann/locale/es_VE/fusiondirectory.po
index 8248a32422b986c0f2d68f1691caf83299fcc897..584aaac1b48332b56f5aa86e4cf16488687331cd 100644
--- a/supann/locale/es_VE/fusiondirectory.po
+++ b/supann/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -646,3 +646,9 @@ msgstr ""
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/fa_IR/fusiondirectory.po b/supann/locale/fa_IR/fusiondirectory.po
index 734e89de772df510ad457e82382adddb44718645..9aac708e1e90f92beb37b6c6d0015ba991fdcb86 100644
--- a/supann/locale/fa_IR/fusiondirectory.po
+++ b/supann/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa_IR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/supannStructures/class_etablissement.inc:31
 #: personal/supann/class_supannAccount.inc:327
@@ -646,3 +646,9 @@ msgstr ""
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/fi_FI/fusiondirectory.po b/supann/locale/fi_FI/fusiondirectory.po
index 6022721326889938e299dc3576dce2ce846cb4a7..dd116dd0d44a4daf7accb5e346b60414079aa500 100644
--- a/supann/locale/fi_FI/fusiondirectory.po
+++ b/supann/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
@@ -646,3 +646,9 @@ msgstr ""
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/fr/fusiondirectory.po b/supann/locale/fr/fusiondirectory.po
index 9292cee0e8df6c4693dedf92faff91c7edc39b02..75f43690755fb4a7c0efb122d030d545883d86ba 100644
--- a/supann/locale/fr/fusiondirectory.po
+++ b/supann/locale/fr/fusiondirectory.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Côme Chilliet, 2018\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2018\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"
@@ -676,3 +676,11 @@ msgstr ""
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr "Type d’affectation"
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
+"Les valeurs \"member\" et \"affiliate\" sont incompatibles pour "
+"eduPersonAffiliation. Veuillez en retirer un."
diff --git a/supann/locale/hu_HU/fusiondirectory.po b/supann/locale/hu_HU/fusiondirectory.po
index 87bf4cf30c190ac6b6e6c73a36031f40ac6681de..64b840159a4e0259557356f3edc1beb2c577cd61 100644
--- a/supann/locale/hu_HU/fusiondirectory.po
+++ b/supann/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -646,3 +646,9 @@ msgstr ""
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/id/fusiondirectory.po b/supann/locale/id/fusiondirectory.po
index 6346f75615c4bf49241a156de51a329dfc588c4a..beab09dbb22401f991e7348585ced8013c32acc9 100644
--- a/supann/locale/id/fusiondirectory.po
+++ b/supann/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -645,3 +645,9 @@ msgstr ""
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/it_IT/fusiondirectory.po b/supann/locale/it_IT/fusiondirectory.po
index a3f377c344ffd621ec1a1bbc24bfd1f5352fe76b..47d7d0b3cf525af8167288be8e0716cad88b3825 100644
--- a/supann/locale/it_IT/fusiondirectory.po
+++ b/supann/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Paola Penati <paola.penati@opensides.be>, 2018\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
@@ -670,3 +670,11 @@ msgstr "supannRoleGenerique - Ruoli generici della persona nella struttura"
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr "Assegnazione tipo di identità"
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
+"I valori \"membro\" e \"affiliato\" sono incompatibili con "
+"eduPersonAffiliation. Si prega di rimuovere uno di loro."
diff --git a/supann/locale/ja/fusiondirectory.po b/supann/locale/ja/fusiondirectory.po
index 944bda233dabd1a7d3abee5a4d41fa2403063e9f..3425ffcb2bc3d56f72395541735a7f0fa63d8906 100644
--- a/supann/locale/ja/fusiondirectory.po
+++ b/supann/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -645,3 +645,9 @@ msgstr ""
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/ko/fusiondirectory.po b/supann/locale/ko/fusiondirectory.po
index 1f38eb6cac9282b73eef3d44665dec9c198148ac..820eb0f134824fd7b5f2e89d0f5c69c0379ad0ed 100644
--- a/supann/locale/ko/fusiondirectory.po
+++ b/supann/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
@@ -646,3 +646,9 @@ msgstr ""
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/lv/fusiondirectory.po b/supann/locale/lv/fusiondirectory.po
index 0fb9ba8c268cd470b8785e461b6fb2c8f3188669..77b3eb12fab96f34f41bd81922e9fecb7669023a 100644
--- a/supann/locale/lv/fusiondirectory.po
+++ b/supann/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -646,3 +646,9 @@ msgstr ""
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/nb/fusiondirectory.po b/supann/locale/nb/fusiondirectory.po
index 168c816331808eb7ccfe577add5faf20d316016e..229d9b3e30a1991d806f6a71bd5585248e0afc19 100644
--- a/supann/locale/nb/fusiondirectory.po
+++ b/supann/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -646,3 +646,9 @@ msgstr ""
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/nl/fusiondirectory.po b/supann/locale/nl/fusiondirectory.po
index d8463ac3ded5d0c934aedc8585c2e0d386c8df6e..dfd96ded5878637cc385405e26f66dd8ab2190f1 100644
--- a/supann/locale/nl/fusiondirectory.po
+++ b/supann/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Lucien Antonissen <lucien.antonissen@digipolis.be>, 2018\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
@@ -646,3 +646,9 @@ msgstr ""
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/pl/fusiondirectory.po b/supann/locale/pl/fusiondirectory.po
index 35d707be52aeda31b64b242ae268fbb64232e7ae..55acd160ba7148364b3f28e9e8dd244ac04ed5c0 100644
--- a/supann/locale/pl/fusiondirectory.po
+++ b/supann/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -646,3 +646,9 @@ msgstr ""
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/pt/fusiondirectory.po b/supann/locale/pt/fusiondirectory.po
index 4584ab857171dff631ec6fab51eaa3adecb46a3f..2f82231224d7cfeeb5674838dea5c50b8a585363 100644
--- a/supann/locale/pt/fusiondirectory.po
+++ b/supann/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -646,3 +646,9 @@ msgstr ""
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/pt_BR/fusiondirectory.po b/supann/locale/pt_BR/fusiondirectory.po
index 67d8a537fe77582e44fd0ed40ca83b2cf1f3efc9..8936dfa381af8e2914300a4d7c43dd136523e5d4 100644
--- a/supann/locale/pt_BR/fusiondirectory.po
+++ b/supann/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -646,3 +646,9 @@ msgstr ""
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/ru/fusiondirectory.po b/supann/locale/ru/fusiondirectory.po
index b658db300fab47a29389a4ac4b855cea007811a2..38f6606c60d849241f437fbb945a4f1ac1d548a4 100644
--- a/supann/locale/ru/fusiondirectory.po
+++ b/supann/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -646,3 +646,9 @@ msgstr ""
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/ru@petr1708/fusiondirectory.po b/supann/locale/ru@petr1708/fusiondirectory.po
index d9416910c7c68c5514cdeec45a07805c828a7610..ed33da37e725c0f52fe48daf362c3b93cad2a595 100644
--- a/supann/locale/ru@petr1708/fusiondirectory.po
+++ b/supann/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -645,3 +645,9 @@ msgstr ""
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/sv/fusiondirectory.po b/supann/locale/sv/fusiondirectory.po
index f0f01e748f95073c4fe50d8f54f6290461d6eead..4ed08feecae38b578f5ab69c1e8b20b7ade2d572 100644
--- a/supann/locale/sv/fusiondirectory.po
+++ b/supann/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -646,3 +646,9 @@ msgstr ""
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/tr_TR/fusiondirectory.po b/supann/locale/tr_TR/fusiondirectory.po
index d38e9b89c74ee7a5b875c9b0992d203065747e39..7d43a1afc88e41e6d8487964123a6b42cbc31bd5 100644
--- a/supann/locale/tr_TR/fusiondirectory.po
+++ b/supann/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
@@ -645,3 +645,9 @@ msgstr ""
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/ug/fusiondirectory.po b/supann/locale/ug/fusiondirectory.po
index ed66f877bd9f1da97b7ae76af9cd0296c67fd759..27e74f74c9fd91845b4fc6fb12911d244e958a25 100644
--- a/supann/locale/ug/fusiondirectory.po
+++ b/supann/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -645,3 +645,9 @@ msgstr ""
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/vi_VN/fusiondirectory.po b/supann/locale/vi_VN/fusiondirectory.po
index 7c8268cbec183737704f598f3fd9e1e15ad0f3f1..29084f51a833473aa0f886b6f5ae1bd50ab30c67 100644
--- a/supann/locale/vi_VN/fusiondirectory.po
+++ b/supann/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -646,3 +646,9 @@ msgstr ""
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/zh/fusiondirectory.po b/supann/locale/zh/fusiondirectory.po
index f8d6af7c58365e7380329fa9c958d1296ea21c04..9b0bafc0dc40339806954225ecd5c9cd0b1e2b00 100644
--- a/supann/locale/zh/fusiondirectory.po
+++ b/supann/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -646,3 +646,9 @@ msgstr ""
 #: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/locale/zh_TW/fusiondirectory.po b/supann/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..2ea7b26a8fca62c4fac6d46e6cb223a53b673989
--- /dev/null
+++ b/supann/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,653 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/supannStructures/class_etablissement.inc:31
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
+msgid "Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:32
+msgid "SUPANN Establishment Settings"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:35
+msgid "SUPANN Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:52
+msgid "Properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Root Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:55
+msgid "Set this Establishment as the root one"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:59
+#: admin/supannStructures/class_entite.inc:55
+msgid "Name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:59
+msgid "The name to write in the o attribute for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:63
+#: admin/supannStructures/class_entite.inc:76
+msgid "Description"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:63
+msgid "A short description of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:69
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Location"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:72
+msgid "Usually the city where this Establishment is"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "Address"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:76
+msgid "The postal address of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:80
+#: admin/supannStructures/class_entite.inc:64
+msgid "Telephone"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:80
+msgid "Phone number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:84
+#: admin/supannStructures/class_entite.inc:68
+msgid "Fax"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:84
+msgid "Fax number for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:90
+msgid "SUPANN properties"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "Establishment code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:93
+msgid "The code of this Establishment (must have a prefix between {})"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "SUPANN code"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:98
+msgid "The SUPANN code for this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "Legal name"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:103
+msgid "The legal name of this Establishment"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "Home page URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:107
+msgid "The URI of this Establishment website home page"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "Institution URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:111
+msgid "The URI of this Establishment institution website"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "White pages URI"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:115
+msgid "The URI of this Establishment white pages"
+msgstr ""
+
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
+msgid "LDAP error"
+msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:35
+msgid "Supann structures"
+msgstr ""
+
+#: admin/supannStructures/class_supannStructuresManagement.inc:36
+msgid "Supann structures management"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:53
+msgid "File error"
+msgstr ""
+
+#: admin/supannStructures/class_supann.inc:54
+#, php-format
+msgid "Cannot read file: '%s'"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:31
+#: admin/supannStructures/class_entite.inc:52
+msgid "Entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:32
+msgid "SUPANN Entity Settings"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:35
+msgid "SUPANN Entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:55
+msgid "The name to write in the ou attribute for this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:61
+msgid "Administrative information"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:64
+msgid "Phone number for this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:68
+msgid "Fax number for this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:72
+msgid "Postal address"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:72
+msgid "Postal address of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:76
+msgid "Short description of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:82
+msgid "SUPANN information"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "Entity type"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:85
+msgid "The best SUPANN type that fits this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "Entity code"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:89
+msgid "The SUPANN code of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "Parent entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:94
+msgid "The parent entity of this entity"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:99
+msgid "Reference IDs"
+msgstr ""
+
+#: admin/supannStructures/class_entite.inc:99
+msgid "supannRefId - IDs/links for this entity on other systems"
+msgstr ""
+
+#: config/supann/class_supannConfig.inc:28
+msgid "SUPANN configuration"
+msgstr ""
+
+#: config/supann/class_supannConfig.inc:29
+msgid "FusionDirectory SUPANN plugin configuration"
+msgstr ""
+
+#: config/supann/class_supannConfig.inc:41
+msgid "SUPANN"
+msgstr ""
+
+#: config/supann/class_supannConfig.inc:44
+msgid "SUPANN RDN"
+msgstr ""
+
+#: config/supann/class_supannConfig.inc:44
+msgid "Branch in which SUPANN structures will be stored"
+msgstr ""
+
+#: config/supann/class_supannConfig.inc:49
+msgid "SUPANN mail for recovery"
+msgstr ""
+
+#: config/supann/class_supannConfig.inc:49
+msgid ""
+"Allow the use of mail addresses from the personal mail address field from "
+"SUPANN account for password recovery"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:36
+#: personal/supann/class_supannAccount.inc:111
+msgid "None"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:108
+msgid "Licence"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:108
+msgid "Master"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:108
+msgid "Ph.D."
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:108
+msgid "Another class of degree"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:108
+msgid "post-graduate year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:111
+msgid "1st year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:111
+msgid "2nd year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:111
+msgid "3rd year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:112
+msgid "4th year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:112
+msgid "5th year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:112
+msgid "6th year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:113
+msgid "7th year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:113
+msgid "8th year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:113
+msgid "9th year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:216
+msgid "SupAnn"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:217
+msgid "SupAnn information management plugin"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:234
+msgid "Identity"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:237
+msgid "Civilite"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:237
+msgid "supannCivilite - Civility for this person"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:242
+msgid "Alias login"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:242
+msgid "supannAliasLogin - An alias for the login of this user"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:246
+msgid "eduPersonPrincipalName"
+msgstr ""
+
+#: 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:250
+msgid "Nick name"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:250
+msgid "eduPersonNickname - Can contain a nick name for this user"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:255
+msgid "Ref ids"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:255
+msgid "supannRefId - IDs/links for this user on other systems"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:265
+msgid "Contact"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:269
+msgid "Other phone numbers"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:269
+msgid "supannAutreTelephone - Other phone numbers for this user"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:275
+msgid "Other mail addresses"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:275
+msgid ""
+"supannAutreMail - Other mail addresses for this user. Each must be unique"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:281
+msgid "Personal mail addresses"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:281
+msgid "supannMailPerso - Personal mail addresses for this user"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:286
+msgid "red List"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:286
+msgid "supannListeRouge - Should this person be on the red list"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:292
+msgid "Affectation"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:295
+msgid "Entity primary assignment"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:295
+msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
+msgstr ""
+
+#: 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: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:306
+msgid "Entity type assignment"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
+msgid "supannTypeEntiteAffectation"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:313
+msgid "Affiliation"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:316
+msgid "Primary affiliation"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:316
+msgid "eduPersonPrimaryAffiliation - Main status of the person"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:321
+msgid "Affiliations"
+msgstr ""
+
+#: 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:327
+msgid ""
+"supannEtablissement - institution or unit of administrative attachment of "
+"the person"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:334
+msgid "Student profile"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:337
+msgid "INE code"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:337
+msgid "supannCodeINE - INE code of this student"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:341
+msgid "Student ID"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:341
+msgid "supannEtuId - Scolarity id"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:347
+msgid "Student subscriptions"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:362
+msgid "supannEtuInscription - Subscriptions for this student"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:366
+msgid ""
+"supannEtablissement - Etablissement in which this subscription was done"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:370
+msgid "Year"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:370
+msgid "supannEtuAnneeInscription - The year this subscription will begin"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:375
+msgid "Subscription type"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:375
+msgid "supannEtuRegimeInscription - The type of this subscription"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:379
+msgid "Disciplinary Sector"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:379
+msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:383
+msgid "Diploma type"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:383
+msgid "supannEtuTypeDiplome - Type of diploma"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:387
+msgid "Curriculum year "
+msgstr ""
+
+#: 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:391
+msgid "supannEntiteAffectation_affect"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:395
+msgid "Diploma"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:395
+msgid "supannEtuDiplome - Diploma prepared by the student"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:399
+msgid "Step"
+msgstr ""
+
+#: 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:403
+msgid "educational element"
+msgstr ""
+
+#: 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:417
+msgid "Personal profile"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:420
+msgid "Personal ID"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:420
+msgid "supannEmpId - Employee identifier"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:424
+msgid "Personal corps"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:424
+msgid "supannEmpCorps"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:429
+msgid "Activity"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:429
+msgid "supannActivite - category of profession"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:436
+msgid "Roles"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:443
+msgid "supannRoleEntite"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:447
+msgid "Generic role"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:447
+msgid "supannRoleGenerique - Generics Roles of the person in the facility"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:451
+msgid "Entity assignment type"
+msgstr ""
+
+#: personal/supann/class_supannAccount.inc:567
+msgid ""
+"\"member\" and \"affiliate\" values are incompatible for "
+"eduPersonAffiliation. Please remove one of them."
+msgstr ""
diff --git a/supann/personal/supann/class_supannAccount.inc b/supann/personal/supann/class_supannAccount.inc
index 770f5628f3c29858ad1346b3e5204241c5792f7e..d2a0973d1de8e0a9d0cb25634449c9bc3228dfbb 100644
--- a/supann/personal/supann/class_supannAccount.inc
+++ b/supann/personal/supann/class_supannAccount.inc
@@ -558,12 +558,30 @@ class supannAccount extends simplePlugin
     );
   }
 
+  function check()
+  {
+    $message = parent::check();
+
+    $affiliations = $this->eduPersonAffiliation;
+    if (in_array('member', $affiliations) && in_array('affiliate', $affiliations)) {
+      $message[] = _('"member" and "affiliate" values are incompatible for eduPersonAffiliation. Please remove one of them.');
+    }
+
+    return $message;
+  }
+
   function save_object()
   {
     parent::save_object();
     $this->updateFieldsChoices();
   }
 
+  function adapt_from_template($attrs, $skip = array())
+  {
+    parent::adapt_from_template($attrs, $skip);
+    $this->updateFieldsChoices();
+  }
+
   protected function prepare_save ()
   {
     $this->attributesAccess['supannEtuInscription']->supannPrepareSave();
diff --git a/sympa/locale/af_ZA/fusiondirectory.po b/sympa/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..6a928f88e86e715051720329823056a795fc49c2
--- /dev/null
+++ b/sympa/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,110 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/systems/services/sympa/class_serviceSympa.inc:31
+#: admin/systems/services/sympa/class_serviceSympa.inc:32
+msgid "Sympa Server"
+msgstr ""
+
+#: admin/systems/services/sympa/class_serviceSympa.inc:32
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/sympa/class_serviceSympa.inc:46
+#: admin/sympa/class_sympaAlias.inc:64
+msgid "Sympa server"
+msgstr ""
+
+#: admin/systems/services/sympa/class_serviceSympa.inc:49
+msgid "URL"
+msgstr ""
+
+#: admin/systems/services/sympa/class_serviceSympa.inc:49
+msgid "URL to access the sympa server"
+msgstr ""
+
+#: admin/systems/services/sympa/class_serviceSympa.inc:53
+msgid "User"
+msgstr ""
+
+#: admin/systems/services/sympa/class_serviceSympa.inc:53
+msgid "User to access sympa server SOAP API."
+msgstr ""
+
+#: admin/systems/services/sympa/class_serviceSympa.inc:57
+msgid "Password"
+msgstr ""
+
+#: admin/systems/services/sympa/class_serviceSympa.inc:57
+msgid "Password to access sympa server SOAP API."
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:33
+#: config/sympa/class_sympaConfig.inc:42
+msgid "Sympa"
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr ""
+
+#: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
+msgid "Sympa list alias"
+msgstr ""
+
+#: admin/sympa/class_sympaAlias.inc:52
+msgid "Name"
+msgstr ""
+
+#: admin/sympa/class_sympaAlias.inc:52
+msgid "Name to identify this alias"
+msgstr ""
+
+#: admin/sympa/class_sympaAlias.inc:54
+msgid "Description"
+msgstr ""
+
+#: admin/sympa/class_sympaAlias.inc:54
+msgid "Description of this alias"
+msgstr ""
+
+#: admin/sympa/class_sympaAlias.inc:59
+msgid "Email address"
+msgstr ""
+
+#: admin/sympa/class_sympaAlias.inc:64
+msgid "Sympa server for this alias"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr ""
diff --git a/sympa/locale/ar/fusiondirectory.po b/sympa/locale/ar/fusiondirectory.po
index 8e9667e05095bc0a1bb9f2ffa33035697beea822..7556f4f5954ff8e581b35aca07ad0375d5ce03db 100644
--- a/sympa/locale/ar/fusiondirectory.po
+++ b/sympa/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/sympa/locale/ca/fusiondirectory.po b/sympa/locale/ca/fusiondirectory.po
index 916b6b4fb8807ee3b096fc4dffd574b310ddb9fe..f8953a3fd397fc586d7d7972c8773c40a09da4ad 100644
--- a/sympa/locale/ca/fusiondirectory.po
+++ b/sympa/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/sympa/locale/cs_CZ/fusiondirectory.po b/sympa/locale/cs_CZ/fusiondirectory.po
index bd4d49b2bd8b82aad4b16313fe5da70bef0130cf..96808d4a35063871f1eaa44336cf250c21a8ba7b 100644
--- a/sympa/locale/cs_CZ/fusiondirectory.po
+++ b/sympa/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:31
 #: admin/systems/services/sympa/class_serviceSympa.inc:32
diff --git a/sympa/locale/de/fusiondirectory.po b/sympa/locale/de/fusiondirectory.po
index 89da5c16f03ad68581d8f6d0e065735103e4d912..7ec23422e4714179acfb0cfc108d53ad0b3f20a2 100644
--- a/sympa/locale/de/fusiondirectory.po
+++ b/sympa/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sympa/locale/el_GR/fusiondirectory.po b/sympa/locale/el_GR/fusiondirectory.po
index b39a752f3ac71be0dee1bb7c52758c34eaed114a..d4bfafa261d2c8cbaabfb9c41bd670100674c86e 100644
--- a/sympa/locale/el_GR/fusiondirectory.po
+++ b/sympa/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sympa/locale/es/fusiondirectory.po b/sympa/locale/es/fusiondirectory.po
index 7554418bef996f3e220fe3895fd868dd647fddc6..d9e814a6e747d6e782bf960353db222f921a5531 100644
--- a/sympa/locale/es/fusiondirectory.po
+++ b/sympa/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sympa/locale/es_CO/fusiondirectory.po b/sympa/locale/es_CO/fusiondirectory.po
index aafadb797a1296f7632a0d5fee686d3b064b83a9..bb8446f6a375b2556e38f20b34455c99758879da 100644
--- a/sympa/locale/es_CO/fusiondirectory.po
+++ b/sympa/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sympa/locale/es_VE/fusiondirectory.po b/sympa/locale/es_VE/fusiondirectory.po
index 9338a7e366a42b762e02ce2b58826900823eea80..25bc693bfaae5a99f54fa7b1f9c2ca46206f2ce1 100644
--- a/sympa/locale/es_VE/fusiondirectory.po
+++ b/sympa/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sympa/locale/fa_IR/fusiondirectory.po b/sympa/locale/fa_IR/fusiondirectory.po
index b3ff4259a6bd477e22ce85c60c7f2fbf2f025110..dc640a3af8de4bc68e0a79b5d21acdd8c2e0882c 100644
--- a/sympa/locale/fa_IR/fusiondirectory.po
+++ b/sympa/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:31
 #: admin/systems/services/sympa/class_serviceSympa.inc:32
diff --git a/sympa/locale/fi_FI/fusiondirectory.po b/sympa/locale/fi_FI/fusiondirectory.po
index 68175740f9027a04eedcf7648737e6dfe9b9a3f9..e017591bd82e5605cda1bc31d48dd3a442b0e2bb 100644
--- a/sympa/locale/fi_FI/fusiondirectory.po
+++ b/sympa/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/sympa/locale/fr/fusiondirectory.po b/sympa/locale/fr/fusiondirectory.po
index 3033525a8fcdaffde26daa9176995b04251f2a32..a93e40457de038286843c5adb4dfbfde216d1924 100644
--- a/sympa/locale/fr/fusiondirectory.po
+++ b/sympa/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Côme Chilliet, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/sympa/locale/hu_HU/fusiondirectory.po b/sympa/locale/hu_HU/fusiondirectory.po
index a79b3a6a32bf9025487031dcd43b56a2ff110e25..29e457db4a619036988ab9bb2a3b368c494bf1cf 100644
--- a/sympa/locale/hu_HU/fusiondirectory.po
+++ b/sympa/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/sympa/locale/id/fusiondirectory.po b/sympa/locale/id/fusiondirectory.po
index 7eaabbc14183e275934983a3f5d806a95e2a2246..8768322746ff046050e1bcc35b9599cc4c56ca33 100644
--- a/sympa/locale/id/fusiondirectory.po
+++ b/sympa/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sympa/locale/it_IT/fusiondirectory.po b/sympa/locale/it_IT/fusiondirectory.po
index b674ca600bea73a46f16f6932edcb5ee49b2b612..5d62328d8823c0e33f96590a287bb3eb180d739f 100644
--- a/sympa/locale/it_IT/fusiondirectory.po
+++ b/sympa/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/sympa/locale/ja/fusiondirectory.po b/sympa/locale/ja/fusiondirectory.po
index d6d5be86dd177c75b1b10c90eb04aa186204d062..834b89edb7e045f5870d6373311ffb786478906c 100644
--- a/sympa/locale/ja/fusiondirectory.po
+++ b/sympa/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sympa/locale/ko/fusiondirectory.po b/sympa/locale/ko/fusiondirectory.po
index f311308b3c379b8b4d54c7c49a3a74156c6821d9..ddaed4b4bf25d7c7f267ffd5a2ecec4d469402b0 100644
--- a/sympa/locale/ko/fusiondirectory.po
+++ b/sympa/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/sympa/locale/lv/fusiondirectory.po b/sympa/locale/lv/fusiondirectory.po
index c610bd47e1794e98c5f14d0ae805a8bfb0ea8d5a..80e1e6fb2c692036ed5c294e9c93f2e6b30a982a 100644
--- a/sympa/locale/lv/fusiondirectory.po
+++ b/sympa/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/sympa/locale/nb/fusiondirectory.po b/sympa/locale/nb/fusiondirectory.po
index ed62aca5c5708c882a681c5b66369f33ba9c11f6..96b1c8efa78b7cf88fc5206b67d188f7290e910a 100644
--- a/sympa/locale/nb/fusiondirectory.po
+++ b/sympa/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/sympa/locale/nl/fusiondirectory.po b/sympa/locale/nl/fusiondirectory.po
index 57772cd14f1241f65cd256ec8ff86b813c80a982..e0319ad911d60a5cc5bfcb30c052f6c502d06329 100644
--- a/sympa/locale/nl/fusiondirectory.po
+++ b/sympa/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/sympa/locale/pl/fusiondirectory.po b/sympa/locale/pl/fusiondirectory.po
index 6b4c2e59e8a4ec3028fdc53bb94ad7ec12940b96..7a844e36c82a07d16a1641b9556dfabbe3c4e5ad 100644
--- a/sympa/locale/pl/fusiondirectory.po
+++ b/sympa/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sympa/locale/pt/fusiondirectory.po b/sympa/locale/pt/fusiondirectory.po
index 251ed6b6ba892d1c9907165448e10e9662522a59..a052e0a8c7b23e752dae94ebbe690dbe53f826a6 100644
--- a/sympa/locale/pt/fusiondirectory.po
+++ b/sympa/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/sympa/locale/pt_BR/fusiondirectory.po b/sympa/locale/pt_BR/fusiondirectory.po
index dcf30840c654086c54a6caf8ed1d31c91e4a7fbb..c538fba62cd3bb237e9dbaafc3e4640c3607e41f 100644
--- a/sympa/locale/pt_BR/fusiondirectory.po
+++ b/sympa/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sympa/locale/ru/fusiondirectory.po b/sympa/locale/ru/fusiondirectory.po
index 9dbf343b20e7573709f12b368e4e05b8de0f4b5c..bb15578504e7e09b80e01ba7cb82ff77c40f154c 100644
--- a/sympa/locale/ru/fusiondirectory.po
+++ b/sympa/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sympa/locale/ru@petr1708/fusiondirectory.po b/sympa/locale/ru@petr1708/fusiondirectory.po
index 401dad5852218e90406a10ecfff82d816d174fd2..c8aed26306f00402f5b8d22d1ca80916a3871fb8 100644
--- a/sympa/locale/ru@petr1708/fusiondirectory.po
+++ b/sympa/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sympa/locale/sv/fusiondirectory.po b/sympa/locale/sv/fusiondirectory.po
index ae5f37933b46f2347536d3b9536f94e54772ec75..9adc031f3ab01d129e16c5c3f827b20af0fbe7ab 100644
--- a/sympa/locale/sv/fusiondirectory.po
+++ b/sympa/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sympa/locale/tr_TR/fusiondirectory.po b/sympa/locale/tr_TR/fusiondirectory.po
index 780f26f02d6900902e0d87d35f50e0b9904ee71e..2cce731d4efdcffa089919c1e35831fb6c0a8281 100644
--- a/sympa/locale/tr_TR/fusiondirectory.po
+++ b/sympa/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sympa/locale/ug/fusiondirectory.po b/sympa/locale/ug/fusiondirectory.po
index 0ba689d4cb25a1cb3741147972eadb7ff97b440e..4a50198f3d3045286e1a981ac25ec35ec2a71d90 100644
--- a/sympa/locale/ug/fusiondirectory.po
+++ b/sympa/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/sympa/locale/vi_VN/fusiondirectory.po b/sympa/locale/vi_VN/fusiondirectory.po
index fb415b9e60f3fd2a4dcf59d61650e4900a7f974c..1d40f71dd6ef13cc593a3d648167a6d009a00051 100644
--- a/sympa/locale/vi_VN/fusiondirectory.po
+++ b/sympa/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/sympa/locale/zh/fusiondirectory.po b/sympa/locale/zh/fusiondirectory.po
index ddaf6b368fb14322c773c67c2f937fe97ffa86bb..c828bae098fcd051e15408456dbea7ee8f6887e6 100644
--- a/sympa/locale/zh/fusiondirectory.po
+++ b/sympa/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/sympa/locale/zh_TW/fusiondirectory.po b/sympa/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..2a943304be2bb2ef750d2d4bf027fbcaa192d76b
--- /dev/null
+++ b/sympa/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,110 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/systems/services/sympa/class_serviceSympa.inc:31
+#: admin/systems/services/sympa/class_serviceSympa.inc:32
+msgid "Sympa Server"
+msgstr ""
+
+#: admin/systems/services/sympa/class_serviceSympa.inc:32
+msgid "Services"
+msgstr ""
+
+#: admin/systems/services/sympa/class_serviceSympa.inc:46
+#: admin/sympa/class_sympaAlias.inc:64
+msgid "Sympa server"
+msgstr ""
+
+#: admin/systems/services/sympa/class_serviceSympa.inc:49
+msgid "URL"
+msgstr ""
+
+#: admin/systems/services/sympa/class_serviceSympa.inc:49
+msgid "URL to access the sympa server"
+msgstr ""
+
+#: admin/systems/services/sympa/class_serviceSympa.inc:53
+msgid "User"
+msgstr ""
+
+#: admin/systems/services/sympa/class_serviceSympa.inc:53
+msgid "User to access sympa server SOAP API."
+msgstr ""
+
+#: admin/systems/services/sympa/class_serviceSympa.inc:57
+msgid "Password"
+msgstr ""
+
+#: admin/systems/services/sympa/class_serviceSympa.inc:57
+msgid "Password to access sympa server SOAP API."
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:33
+#: config/sympa/class_sympaConfig.inc:42
+msgid "Sympa"
+msgstr ""
+
+#: admin/sympa/class_sympaManagement.inc:34
+msgid "Sympa management"
+msgstr ""
+
+#: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
+#: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:49
+msgid "Sympa list alias"
+msgstr ""
+
+#: admin/sympa/class_sympaAlias.inc:52
+msgid "Name"
+msgstr ""
+
+#: admin/sympa/class_sympaAlias.inc:52
+msgid "Name to identify this alias"
+msgstr ""
+
+#: admin/sympa/class_sympaAlias.inc:54
+msgid "Description"
+msgstr ""
+
+#: admin/sympa/class_sympaAlias.inc:54
+msgid "Description of this alias"
+msgstr ""
+
+#: admin/sympa/class_sympaAlias.inc:59
+msgid "Email address"
+msgstr ""
+
+#: admin/sympa/class_sympaAlias.inc:64
+msgid "Sympa server for this alias"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:28
+msgid "Sympa configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:29
+msgid "FusionDirectory sympa plugin configuration"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Sympa RDN"
+msgstr ""
+
+#: config/sympa/class_sympaConfig.inc:45
+msgid "Branch in which Sympa objects will be stored"
+msgstr ""
diff --git a/systems/locale/af_ZA/fusiondirectory.po b/systems/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..53bd807b83682adcaf87a6e71d8252ea5aa26554
--- /dev/null
+++ b/systems/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,1000 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/systems/class_phoneGeneric.inc:32
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:66
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+msgid "Phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:33
+msgid "Phone information"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone hardware"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:52
+#: admin/systems/class_printGeneric.inc:58
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+msgid "Properties"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:56 admin/systems/system-list.xml:31
+#: admin/systems/class_printGeneric.inc:62
+#: admin/systems/class_workstationGeneric.inc:63
+#: admin/systems/services/shares/class_serviceShare.inc:51
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+msgid "Name"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:56
+msgid "The name of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:60
+#: admin/systems/serverService-list.xml:35 admin/systems/system-list.xml:55
+#: admin/systems/class_printGeneric.inc:66
+#: admin/systems/class_workstationGeneric.inc:68
+#: admin/systems/services/shares/class_serviceShare.inc:55
+#: admin/systems/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+msgid "Description"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:60
+msgid "A short description of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+msgid "Serial Number"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:69
+msgid "The serial number of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+msgid "Telephone Number"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The telephone number of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+msgid "Network settings"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+msgid "IP address"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_workstationGeneric.inc:95
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address of this system"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:27
+msgid "!"
+msgstr ""
+
+#: 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:90
+msgid "Create"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
+msgid "Remove"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:50
+msgid "Startup parameters"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc: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 ""
+
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr ""
+
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr ""
+
+#: admin/systems/system-list.xml:39
+msgid "IP"
+msgstr ""
+
+#: admin/systems/system-list.xml:47
+msgid "MAC"
+msgstr ""
+
+#: admin/systems/system-list.xml:63
+#: admin/systems/services/shares/class_serviceShare.inc:30
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/class_serverService.inc:60
+msgid "Services"
+msgstr ""
+
+#: admin/systems/system-list.xml:71
+msgid "Release"
+msgstr ""
+
+#: admin/systems/system-list.xml:100
+msgid "Trigger action"
+msgstr ""
+
+#: admin/systems/system-list.xml:107
+msgid "Schedule action"
+msgstr ""
+
+#: 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:173
+msgid "Remove system"
+msgstr ""
+
+#: 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 ""
+
+#: 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"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:62
+msgid "The name of the printer"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:66
+msgid "A short description of the printer"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:72
+msgid "Details"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:75
+msgid "Printer location"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:85
+#: admin/systems/class_printGeneric.inc:88
+msgid "Users which are allowed to use this printer"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:108
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+msgid "IP address this system uses"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
+msgstr ""
+
+#: 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:33
+msgid "Workstation information"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:52
+msgid "workstation"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:64
+#, php-format
+msgid "The name of the %s"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:69
+#, php-format
+msgid "A short description of the %s"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:73
+msgid "Location"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:74
+#, php-format
+msgid "The location of the %s"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:78
+#, php-format
+msgid "Lock this %s"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:79
+#, php-format
+msgid "This will prevent the %s from being reinstalled"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:29
+#: admin/systems/services/shares/class_serviceShare.inc:30
+msgid "Share service"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:42
+msgid "Shares"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:47
+msgid "Shares this server hosts"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:51
+msgid "Name of this share"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:55
+msgid "Description of this share"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:59
+msgid "Type"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:59
+msgid "Type of share"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:64
+msgid "Codepage"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:64
+msgid "Codepage for this share"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:68
+msgid "Path / Volume"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:68
+msgid "Path or volume concerned by this share"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:72
+msgid "Option"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:72
+msgid "Special option(s) for this share"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:105
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+msgid "Error"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:105
+msgid "You need to configure encodings first"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:112
+msgid "Warning"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:112
+#, php-format
+msgid "Invalid value in encodings : %s"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:35
+#: admin/systems/services/ldap/class_serviceLDAP.inc:96
+msgid "LDAP service"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:39
+msgid "LDAP Base"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:39
+msgid "The LDAP base to use for this LDAP server"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:44
+msgid "LDAP URI"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:44
+msgid "The LDAP URI to use in order to contact this LDAP server"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:46
+msgid "fill-in-your-servers-dns-name"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:51
+msgid "Size limit"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:51
+msgid "Limit the number of record returned"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:56
+msgid "Time limit"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:56
+msgid "Time limit for the result to be returned"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:61
+msgid "Deref"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:61
+msgid "Specifies how alias dereferencing is done when performing a search"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:66
+msgid "TLS Cert"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:66
+msgid "Filepath to tls certificate"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:70
+msgid "TLS Key"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:70
+msgid "Filepath to tls key"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:74
+msgid "TLS CaCert"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:74
+msgid "Filepath to tls ca certificate"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:78
+msgid "TLS ReqCert"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:78
+msgid ""
+"Specifies what checks to perform on server certificates in a TLS session, if"
+" any"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:83
+msgid "TLS CrlCheck"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:83
+msgid ""
+"Specifies if the Certificate Revocation List (CRL) of the CA should be used "
+"to verify if the server certificates have  not  been  revoked"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+msgid "LDAP"
+msgstr ""
+
+#: admin/systems/services/terminal/class_serviceTerminal.inc:29
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/terminal/class_serviceTerminal.inc:41
+msgid "Terminal service"
+msgstr ""
+
+#: admin/systems/services/terminal/class_serviceTerminal.inc:44
+msgid "Temporary disable login"
+msgstr ""
+
+#: admin/systems/services/terminal/class_serviceTerminal.inc:45
+msgid "Disables the login on this terminal server"
+msgstr ""
+
+#: admin/systems/services/terminal/class_serviceTerminal.inc:54
+msgid "Supported session types"
+msgstr ""
+
+#: admin/systems/services/terminal/class_serviceTerminal.inc:55
+msgid "The session types supported by this terminal server"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:61
+msgid "Server services"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:271
+msgid "Information"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:271
+msgid "Cannot update service status until it has been saved!"
+msgstr ""
+
+#: 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_serverGeneric.inc:28
+msgid "server"
+msgstr ""
+
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:181
+msgid "Server"
+msgstr ""
+
+#: admin/systems/class_serverGeneric.inc:40
+msgid "Server information"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:31
+msgid "Component"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:32
+msgid "Component information"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Network device"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:58
+msgid "The name of the component"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:62
+msgid "A short description of the component"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
+#: config/systems/class_systemsPluginConfig.inc:28
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Systems"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:139
+#: admin/systems/class_systemManagement.inc:155
+msgid "Action canceled"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:139
+#, php-format
+msgid "System %s has no mac address defined, cannot trigger action"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:155
+#, php-format
+msgid "System %s is currently installing"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:175
+#: admin/systems/class_systemManagement.inc:201
+msgid "Infrastructure service"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:177
+msgid "Action triggered"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:177
+#, php-format
+msgid "Action called without error (result was \"%s\")"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:268
+#, php-format
+msgid "Inherited from %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:76
+#, php-format
+msgid "Could not parse %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:123
+#, php-format
+msgid "No DHCP server found for IPs %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:142
+#, php-format
+msgid "No DNS server found for zone %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:177
+msgid "Import"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:181
+msgid "The server you wish to import hosts from"
+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:60
+msgid "The name of the mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+msgid "A short description of the mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+msgid "The serial number of the mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+msgid "IMEI Number"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+msgid "The IMEI number of the mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:82
+msgid "OS"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:82
+msgid "The Operating System installed on this phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:88
+msgid "SimCard"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+msgid "The telephone number of the mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+msgid "PUK Number"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+msgid "The PUK number of the simcard in this mobile phone"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:29
+msgid "Systems plugin configuration"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:40
+msgid "LDAP tree for systems"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:43
+msgid "Systems RDN"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:43
+msgid "Branch in which systems will be stored"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:48
+msgid "Server RDN"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:48
+msgid "Branch in which servers will be stored"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:53
+msgid "Workstations RDN"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:53
+msgid "Branch in which workstations will be stored"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:58
+msgid "Terminal RDN"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:58
+msgid "Branch in which terminals will be stored"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:63
+msgid "Printer RDN"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:63
+msgid "Branch in which printers will be stored"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:68
+msgid "Component RDN"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:68
+msgid "Branch in which network devices will be stored"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:73
+msgid "Phone RDN"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:73
+msgid "Branch in which phones will be stored"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:78
+msgid "Mobile phone RDN"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:78
+msgid "Branch in which mobile phones will be stored"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:85
+msgid "Miscellaneous"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:89
+msgid "Available encodings for share services"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:93
+msgid "Encoding"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:93
+msgid "The encoding code name"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:98
+msgid "Label"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:98
+msgid "The encoding displayed name"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:106
+msgid "Encodings"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+msgid "Statistics and information about systems"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:43
+msgid "Statistics"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:48
+msgid "Computer name to use by unit"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:73
+msgid "Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+msgid "Servers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:81
+msgid "Windows Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:85
+msgid "Terminals"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Printers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:93
+msgid "Phones"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:97
+msgid "Components"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:101
+msgid "Mobile phones"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+msgid "Network"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various information"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:41
+msgid "DHCP"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:46
+msgid "DNS"
+msgstr ""
+
+#: admin/systems/serverService-list.tpl.c:2
+msgid "Base"
+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 ""
+
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
+msgstr ""
+
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
+msgstr ""
+
+#: addons/dashboard/systems_stats.tpl.c:8
+msgid "Only one system is configured to run an argonaut client."
+msgid_plural "%1 systems are configured to run an argonaut client."
+msgstr[0] ""
+msgstr[1] ""
+
+#: addons/dashboard/systems_stats.tpl.c:11
+msgid "But no system is configured to run an argonaut client!"
+msgstr ""
+
+#: addons/dashboard/systems_stats.tpl.c:14
+msgid ""
+"A system is configured to run an argonaut client, but there is no argonaut "
+"server configured!"
+msgid_plural ""
+"%1 systems are configured to run an argonaut client, but there is no "
+"argonaut server configured!"
+msgstr[0] ""
+msgstr[1] ""
diff --git a/systems/locale/ar/fusiondirectory.po b/systems/locale/ar/fusiondirectory.po
index cc1c8958dc52e678b77d667d7e32fa1875f712dc..884958f60183c29c3e4248cb0a5e8c1254abc4c0 100644
--- a/systems/locale/ar/fusiondirectory.po
+++ b/systems/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/systems/locale/ca/fusiondirectory.po b/systems/locale/ca/fusiondirectory.po
index 889a7bcb2931e4051fb95ce23660fe2d9292c9b3..8a526cfdce92fed21d752b4806c7b255b1a069b0 100644
--- a/systems/locale/ca/fusiondirectory.po
+++ b/systems/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/systems/locale/cs_CZ/fusiondirectory.po b/systems/locale/cs_CZ/fusiondirectory.po
index fe1e1a18cf86dc5895d323f07169a2e1add07de2..7624a19530b5f6ec1bec922046528cf5ae5dd1b8 100644
--- a/systems/locale/cs_CZ/fusiondirectory.po
+++ b/systems/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
@@ -995,6 +995,7 @@ msgid_plural "%1 systems are configured to run an argonaut client."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
+msgstr[3] ""
 
 #: addons/dashboard/systems_stats.tpl.c:11
 msgid "But no system is configured to run an argonaut client!"
@@ -1010,3 +1011,4 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
+msgstr[3] ""
diff --git a/systems/locale/de/fusiondirectory.po b/systems/locale/de/fusiondirectory.po
index af067bcbadb39cc8702411ebf8fe2bfa78e08808..91b1305b8401ab008513203310472d8c9d600f06 100644
--- a/systems/locale/de/fusiondirectory.po
+++ b/systems/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/systems/locale/el_GR/fusiondirectory.po b/systems/locale/el_GR/fusiondirectory.po
index 0525bf17021921e3d861b83afe580d5dec3bdd1b..3137c35a046616d37c974f79651b486e521cd849 100644
--- a/systems/locale/el_GR/fusiondirectory.po
+++ b/systems/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/systems/locale/es/fusiondirectory.po b/systems/locale/es/fusiondirectory.po
index a31f2d516e12b4d486612d0fba2d8957dba994da..85e8a2e6fdf5dfd2761a1e4aaa4fff61f4104da1 100644
--- a/systems/locale/es/fusiondirectory.po
+++ b/systems/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/systems/locale/es_CO/fusiondirectory.po b/systems/locale/es_CO/fusiondirectory.po
index a3ad774faf47593b0c1a540ba7392819f94fd03a..d287345b2fca4bbe655925d7c69f9779723dedfa 100644
--- a/systems/locale/es_CO/fusiondirectory.po
+++ b/systems/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/systems/locale/es_VE/fusiondirectory.po b/systems/locale/es_VE/fusiondirectory.po
index 3993d2eaabb230dcc55f691d10711459b80924de..836777197e75346e386d6ad5738a0c15ca62ae47 100644
--- a/systems/locale/es_VE/fusiondirectory.po
+++ b/systems/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/systems/locale/fa_IR/fusiondirectory.po b/systems/locale/fa_IR/fusiondirectory.po
index b43ade6105c38ce66db3b3f13c0b2889626cc973..37f3cb4500e903ec83ac9aa9000ea33e2f8aa828 100644
--- a/systems/locale/fa_IR/fusiondirectory.po
+++ b/systems/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa_IR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
@@ -984,6 +984,7 @@ msgstr ""
 msgid "Only one system is configured to run an argonaut client."
 msgid_plural "%1 systems are configured to run an argonaut client."
 msgstr[0] ""
+msgstr[1] ""
 
 #: addons/dashboard/systems_stats.tpl.c:11
 msgid "But no system is configured to run an argonaut client!"
@@ -997,3 +998,4 @@ msgid_plural ""
 "%1 systems are configured to run an argonaut client, but there is no "
 "argonaut server configured!"
 msgstr[0] ""
+msgstr[1] ""
diff --git a/systems/locale/fi_FI/fusiondirectory.po b/systems/locale/fi_FI/fusiondirectory.po
index cd52127074a647e352a6db196220da25c9ea91f9..5165f8f5f4a2cc6acea341af5a63059384c8b391 100644
--- a/systems/locale/fi_FI/fusiondirectory.po
+++ b/systems/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/systems/locale/fr/fusiondirectory.po b/systems/locale/fr/fusiondirectory.po
index 6ec45bd71d26cced7a367c817bd0613fd70aabb3..41482dc10285b05a7a7017765e708988d16b2d9b 100644
--- a/systems/locale/fr/fusiondirectory.po
+++ b/systems/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/systems/locale/hu_HU/fusiondirectory.po b/systems/locale/hu_HU/fusiondirectory.po
index ca03085a6319cabb2d2bf01bead28bfb4aad0ea2..a821fdb81968ad0dad53069decbc7c83e6ce70c1 100644
--- a/systems/locale/hu_HU/fusiondirectory.po
+++ b/systems/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
diff --git a/systems/locale/id/fusiondirectory.po b/systems/locale/id/fusiondirectory.po
index a4380cdbb8fd71e23981e3c9596d4575e5e854f6..8480abd2e8e446966164df86082b6e5a77db5781 100644
--- a/systems/locale/id/fusiondirectory.po
+++ b/systems/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/systems/locale/it_IT/fusiondirectory.po b/systems/locale/it_IT/fusiondirectory.po
index bc9c3b0eea9eba01d7084263d69dabef447a46a8..ef5c45d90bed50f0052ecd309efdf679db0313ae 100644
--- a/systems/locale/it_IT/fusiondirectory.po
+++ b/systems/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/systems/locale/ja/fusiondirectory.po b/systems/locale/ja/fusiondirectory.po
index 549c5b020a6ea058bf0208c023d1a7a35d3a1441..2d5ff95e8ec1f05a7b3b68c644f56887e0a71ddd 100644
--- a/systems/locale/ja/fusiondirectory.po
+++ b/systems/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/systems/locale/ko/fusiondirectory.po b/systems/locale/ko/fusiondirectory.po
index 56c01b7d74b14cc7de72ed2078b1410d4c311b01..d5fd587842ab27cf21f198a6e997e9dce33a8c8a 100644
--- a/systems/locale/ko/fusiondirectory.po
+++ b/systems/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/systems/locale/lv/fusiondirectory.po b/systems/locale/lv/fusiondirectory.po
index 7e6fead2a31c337bc8a7f4c482d7175764235c21..b3d50c24dfc06e4d1d699aa0df4f27d3d7f1c7b0 100644
--- a/systems/locale/lv/fusiondirectory.po
+++ b/systems/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/systems/locale/nb/fusiondirectory.po b/systems/locale/nb/fusiondirectory.po
index 4f6561dd58ae3393484f1fcfd948adecc2c88d7e..18ac2e329cd9c9154190beb1b7d667d87d112e54 100644
--- a/systems/locale/nb/fusiondirectory.po
+++ b/systems/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/systems/locale/nl/fusiondirectory.po b/systems/locale/nl/fusiondirectory.po
index d1795227d043418fe126fec7ba3f238a93065ac9..77046a5f13083ae13772c6878f585707d975bfb0 100644
--- a/systems/locale/nl/fusiondirectory.po
+++ b/systems/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Rombout de Neef <rombout.deneef@digipolis.be>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/systems/locale/pl/fusiondirectory.po b/systems/locale/pl/fusiondirectory.po
index 8f915a57199f079452cff354267cf1afa4e0ae8c..2929a1e95cd90728a3cc3066665fed6fa2330523 100644
--- a/systems/locale/pl/fusiondirectory.po
+++ b/systems/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/systems/locale/pt/fusiondirectory.po b/systems/locale/pt/fusiondirectory.po
index fb78a27d6f8b7375b96b35e6b044ed2d6f0d8820..0af8ea662e2e44a572a68998c57a0a3bc538c22c 100644
--- a/systems/locale/pt/fusiondirectory.po
+++ b/systems/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/systems/locale/pt_BR/fusiondirectory.po b/systems/locale/pt_BR/fusiondirectory.po
index c4d9c13cf79a003bfa4f8d409979b5b5fa449618..a84db774cf5559b22fdcc148304de0ad8d7e9224 100644
--- a/systems/locale/pt_BR/fusiondirectory.po
+++ b/systems/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/systems/locale/ru/fusiondirectory.po b/systems/locale/ru/fusiondirectory.po
index f24c903413d6af153cc37148a7203159742786ee..8cf0a01b7ba8e1af3605e6a6f1dbf8a595c6f7b1 100644
--- a/systems/locale/ru/fusiondirectory.po
+++ b/systems/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/systems/locale/ru@petr1708/fusiondirectory.po b/systems/locale/ru@petr1708/fusiondirectory.po
index db324d42c4edf43220726dd19d75e03d68ce5752..75e9b367645a24a69b57e539b40ea7a4ad7fc91a 100644
--- a/systems/locale/ru@petr1708/fusiondirectory.po
+++ b/systems/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/systems/locale/sv/fusiondirectory.po b/systems/locale/sv/fusiondirectory.po
index 2f46d1b432addb747ed9523ffbfa6fd9032f042e..bd752e5212db39c66f4b17ee22c8c9cbb90d2600 100644
--- a/systems/locale/sv/fusiondirectory.po
+++ b/systems/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/systems/locale/tr_TR/fusiondirectory.po b/systems/locale/tr_TR/fusiondirectory.po
index d8d1edfa8b8fbba5c75081aa8abffaa9255cf630..7eaf6d51df9ee64f819ea734909ce294fe35bbae 100644
--- a/systems/locale/tr_TR/fusiondirectory.po
+++ b/systems/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/systems/locale/ug/fusiondirectory.po b/systems/locale/ug/fusiondirectory.po
index 4593007d50c388cc57a1d5dd5c33fdba3a35d5a8..daa37abe5d7db9065a9c5f1ab15120b7ed7161b5 100644
--- a/systems/locale/ug/fusiondirectory.po
+++ b/systems/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/systems/locale/vi_VN/fusiondirectory.po b/systems/locale/vi_VN/fusiondirectory.po
index 6c80c85136687c1a6c8e4423ac62240203d82758..b147dce37adeaa21808049d59f4b43fef8d09dd0 100644
--- a/systems/locale/vi_VN/fusiondirectory.po
+++ b/systems/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/systems/locale/zh/fusiondirectory.po b/systems/locale/zh/fusiondirectory.po
index 63737f6c85e03f10bb55e473b35d670034f7f956..0321672fd59b317794bfbc363593a9cc3876c43c 100644
--- a/systems/locale/zh/fusiondirectory.po
+++ b/systems/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/systems/locale/zh_TW/fusiondirectory.po b/systems/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..d885af4ade2b37071c25ff5466dd2a0468edeb25
--- /dev/null
+++ b/systems/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,998 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/systems/class_phoneGeneric.inc:32
+#: admin/systems/class_phoneGeneric.inc:36
+#: admin/systems/class_phoneGeneric.inc:66
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+msgid "Phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:33
+msgid "Phone information"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:37
+msgid "Phone hardware"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:52
+#: admin/systems/class_printGeneric.inc:58
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+msgid "Properties"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:56 admin/systems/system-list.xml:31
+#: admin/systems/class_printGeneric.inc:62
+#: admin/systems/class_workstationGeneric.inc:63
+#: admin/systems/services/shares/class_serviceShare.inc:51
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+msgid "Name"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:56
+msgid "The name of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:60
+#: admin/systems/serverService-list.xml:35 admin/systems/system-list.xml:55
+#: admin/systems/class_printGeneric.inc:66
+#: admin/systems/class_workstationGeneric.inc:68
+#: admin/systems/services/shares/class_serviceShare.inc:55
+#: admin/systems/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+msgid "Description"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:60
+msgid "A short description of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+msgid "Serial Number"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:69
+msgid "The serial number of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+msgid "Telephone Number"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:73
+msgid "The telephone number of the phone"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+msgid "Network settings"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+msgid "IP address"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_workstationGeneric.inc:95
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address"
+msgstr ""
+
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+msgid "Mac address of this system"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:10
+msgid "List of services"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:14
+msgid "Service"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:27
+msgid "!"
+msgstr ""
+
+#: 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:90
+msgid "Create"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
+msgid "Remove"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:89
+msgid "Get status"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:97
+msgid "Start"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:105
+msgid "Stop"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:113
+msgid "Restart"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:121
+msgid "Edit service"
+msgstr ""
+
+#: admin/systems/serverService-list.xml:129
+msgid "Remove service"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:32
+msgid "Startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:33
+msgid "Terminal startup"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:50
+msgid "Startup parameters"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc: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 ""
+
+#: admin/systems/class_terminalStartup.inc:63
+msgid "Remote desktop"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:67
+msgid "Connect method"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "XDMCP"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "LDM"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Shell"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Telnet"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:71
+#: admin/systems/services/terminal/class_serviceTerminal.inc:59
+msgid "Windows RDP"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:75
+msgid "Terminal server"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr ""
+
+#: admin/systems/system-list.xml:10
+msgid "List of systems"
+msgstr ""
+
+#: admin/systems/system-list.xml:39
+msgid "IP"
+msgstr ""
+
+#: admin/systems/system-list.xml:47
+msgid "MAC"
+msgstr ""
+
+#: admin/systems/system-list.xml:63
+#: admin/systems/services/shares/class_serviceShare.inc:30
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/class_serverService.inc:60
+msgid "Services"
+msgstr ""
+
+#: admin/systems/system-list.xml:71
+msgid "Release"
+msgstr ""
+
+#: admin/systems/system-list.xml:100
+msgid "Trigger action"
+msgstr ""
+
+#: admin/systems/system-list.xml:107
+msgid "Schedule action"
+msgstr ""
+
+#: 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:173
+msgid "Remove system"
+msgstr ""
+
+#: 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 ""
+
+#: 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"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:62
+msgid "The name of the printer"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:66
+msgid "A short description of the printer"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:72
+msgid "Details"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:75
+msgid "Printer location"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:75
+msgid "The location of the printer"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:79
+msgid "Printer URL"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:79
+msgid "The URL of the printer"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:85
+#: admin/systems/class_printGeneric.inc:88
+msgid "Users which are allowed to use this printer"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:94
+#: admin/systems/class_printGeneric.inc:97
+msgid "Users which are allowed to administrate this printer"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:108
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+msgid "IP address this system uses"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:119
+msgid "Windows paths"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:123
+msgid "Inf file"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:123
+msgid "Path to windows inf file for this printer"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:127
+msgid "Driver directory"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:127
+msgid "Path to directory that contains windows drivers for this printer"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:131
+msgid "Driver name"
+msgstr ""
+
+#: admin/systems/class_printGeneric.inc:131
+msgid "Windows name of the printer driver"
+msgstr ""
+
+#: 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:33
+msgid "Workstation information"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:52
+msgid "workstation"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:64
+#, php-format
+msgid "The name of the %s"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:69
+#, php-format
+msgid "A short description of the %s"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:73
+msgid "Location"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:74
+#, php-format
+msgid "The location of the %s"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:78
+#, php-format
+msgid "Lock this %s"
+msgstr ""
+
+#: admin/systems/class_workstationGeneric.inc:79
+#, php-format
+msgid "This will prevent the %s from being reinstalled"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:29
+#: admin/systems/services/shares/class_serviceShare.inc:30
+msgid "Share service"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:42
+msgid "Shares"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:47
+msgid "Shares this server hosts"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:51
+msgid "Name of this share"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:55
+msgid "Description of this share"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:59
+msgid "Type"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:59
+msgid "Type of share"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:64
+msgid "Codepage"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:64
+msgid "Codepage for this share"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:68
+msgid "Path / Volume"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:68
+msgid "Path or volume concerned by this share"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:72
+msgid "Option"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:72
+msgid "Special option(s) for this share"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:105
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+msgid "Error"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:105
+msgid "You need to configure encodings first"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:112
+msgid "Warning"
+msgstr ""
+
+#: admin/systems/services/shares/class_serviceShare.inc:112
+#, php-format
+msgid "Invalid value in encodings : %s"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:35
+#: admin/systems/services/ldap/class_serviceLDAP.inc:96
+msgid "LDAP service"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:39
+msgid "LDAP Base"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:39
+msgid "The LDAP base to use for this LDAP server"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:44
+msgid "LDAP URI"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:44
+msgid "The LDAP URI to use in order to contact this LDAP server"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:46
+msgid "fill-in-your-servers-dns-name"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:51
+msgid "Size limit"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:51
+msgid "Limit the number of record returned"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:56
+msgid "Time limit"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:56
+msgid "Time limit for the result to be returned"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:61
+msgid "Deref"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:61
+msgid "Specifies how alias dereferencing is done when performing a search"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:66
+msgid "TLS Cert"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:66
+msgid "Filepath to tls certificate"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:70
+msgid "TLS Key"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:70
+msgid "Filepath to tls key"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:74
+msgid "TLS CaCert"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:74
+msgid "Filepath to tls ca certificate"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:78
+msgid "TLS ReqCert"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:78
+msgid ""
+"Specifies what checks to perform on server certificates in a TLS session, if"
+" any"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:83
+msgid "TLS CrlCheck"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:83
+msgid ""
+"Specifies if the Certificate Revocation List (CRL) of the CA should be used "
+"to verify if the server certificates have  not  been  revoked"
+msgstr ""
+
+#: admin/systems/services/ldap/class_serviceLDAP.inc:97
+msgid "LDAP"
+msgstr ""
+
+#: admin/systems/services/terminal/class_serviceTerminal.inc:29
+#: admin/systems/services/terminal/class_serviceTerminal.inc:30
+#: admin/systems/services/terminal/class_serviceTerminal.inc:41
+msgid "Terminal service"
+msgstr ""
+
+#: admin/systems/services/terminal/class_serviceTerminal.inc:44
+msgid "Temporary disable login"
+msgstr ""
+
+#: admin/systems/services/terminal/class_serviceTerminal.inc:45
+msgid "Disables the login on this terminal server"
+msgstr ""
+
+#: admin/systems/services/terminal/class_serviceTerminal.inc:54
+msgid "Supported session types"
+msgstr ""
+
+#: admin/systems/services/terminal/class_serviceTerminal.inc:55
+msgid "The session types supported by this terminal server"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:61
+msgid "Server services"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:271
+msgid "Information"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:271
+msgid "Cannot update service status until it has been saved!"
+msgstr ""
+
+#: 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_serverGeneric.inc:28
+msgid "server"
+msgstr ""
+
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:181
+msgid "Server"
+msgstr ""
+
+#: admin/systems/class_serverGeneric.inc:40
+msgid "Server information"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:31
+msgid "Component"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:32
+msgid "Component information"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
+msgid "Network device"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:58
+msgid "The name of the component"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:62
+msgid "A short description of the component"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
+#: config/systems/class_systemsPluginConfig.inc:28
+#: addons/dashboard/class_dashBoardSystems.inc:30
+msgid "Systems"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:139
+#: admin/systems/class_systemManagement.inc:155
+msgid "Action canceled"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:139
+#, php-format
+msgid "System %s has no mac address defined, cannot trigger action"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:155
+#, php-format
+msgid "System %s is currently installing"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:175
+#: admin/systems/class_systemManagement.inc:201
+msgid "Infrastructure service"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:177
+msgid "Action triggered"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:177
+#, php-format
+msgid "Action called without error (result was \"%s\")"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:268
+#, php-format
+msgid "Inherited from %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:76
+#, php-format
+msgid "Could not parse %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:123
+#, php-format
+msgid "No DHCP server found for IPs %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:142
+#, php-format
+msgid "No DNS server found for zone %s"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:177
+msgid "Import"
+msgstr ""
+
+#: admin/systems/class_systemImport.inc:181
+msgid "The server you wish to import hosts from"
+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:60
+msgid "The name of the mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+msgid "A short description of the mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+msgid "The serial number of the mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+msgid "IMEI Number"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:77
+msgid "The IMEI number of the mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:82
+msgid "OS"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:82
+msgid "The Operating System installed on this phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:88
+msgid "SimCard"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+msgid "The telephone number of the mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+msgid "PUK Number"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:95
+msgid "The PUK number of the simcard in this mobile phone"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:29
+msgid "Systems plugin configuration"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:40
+msgid "LDAP tree for systems"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:43
+msgid "Systems RDN"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:43
+msgid "Branch in which systems will be stored"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:48
+msgid "Server RDN"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:48
+msgid "Branch in which servers will be stored"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:53
+msgid "Workstations RDN"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:53
+msgid "Branch in which workstations will be stored"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:58
+msgid "Terminal RDN"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:58
+msgid "Branch in which terminals will be stored"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:63
+msgid "Printer RDN"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:63
+msgid "Branch in which printers will be stored"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:68
+msgid "Component RDN"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:68
+msgid "Branch in which network devices will be stored"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:73
+msgid "Phone RDN"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:73
+msgid "Branch in which phones will be stored"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:78
+msgid "Mobile phone RDN"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:78
+msgid "Branch in which mobile phones will be stored"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:85
+msgid "Miscellaneous"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:89
+msgid "Available encodings for share services"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:93
+msgid "Encoding"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:93
+msgid "The encoding code name"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:98
+msgid "Label"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:98
+msgid "The encoding displayed name"
+msgstr ""
+
+#: config/systems/class_systemsPluginConfig.inc:106
+msgid "Encodings"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:31
+msgid "Statistics and information about systems"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:43
+msgid "Statistics"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:48
+msgid "Computer name to use by unit"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:73
+msgid "Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:77
+msgid "Servers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:81
+msgid "Windows Workstations"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:85
+msgid "Terminals"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:89
+msgid "Printers"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:93
+msgid "Phones"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:97
+msgid "Components"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardSystems.inc:101
+msgid "Mobile phones"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:28
+msgid "Network"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:29
+msgid "Statistics and various information"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:41
+msgid "DHCP"
+msgstr ""
+
+#: addons/dashboard/class_dashBoardNetwork.inc:46
+msgid "DNS"
+msgstr ""
+
+#: admin/systems/serverService-list.tpl.c:2
+msgid "Base"
+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 ""
+
+#: addons/dashboard/systems_stats.tpl.c:2
+msgid "There are several argonaut servers! (this is not yet supported)"
+msgstr ""
+
+#: addons/dashboard/systems_stats.tpl.c:5
+msgid "There is an argonaut server running on %1 (%3://%2:%4)"
+msgstr ""
+
+#: addons/dashboard/systems_stats.tpl.c:8
+msgid "Only one system is configured to run an argonaut client."
+msgid_plural "%1 systems are configured to run an argonaut client."
+msgstr[0] ""
+
+#: addons/dashboard/systems_stats.tpl.c:11
+msgid "But no system is configured to run an argonaut client!"
+msgstr ""
+
+#: addons/dashboard/systems_stats.tpl.c:14
+msgid ""
+"A system is configured to run an argonaut client, but there is no argonaut "
+"server configured!"
+msgid_plural ""
+"%1 systems are configured to run an argonaut client, but there is no "
+"argonaut server configured!"
+msgstr[0] ""
diff --git a/user-reminder/locale/af_ZA/fusiondirectory.po b/user-reminder/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..6022d255776f1ac1750ef3f9bf2e2b1d031a4d8b
--- /dev/null
+++ b/user-reminder/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,187 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: config/user-reminder/class_userReminderConfig.inc:28
+msgid "User reminder"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:29
+msgid "Configuration for the reminder of accounts expiration"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:40
+msgid "User reminder settings"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:43
+msgid "Delay before expiration"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:43
+msgid "Days before expiration to send the first mail"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:48
+msgid "Delay before sending again"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:48
+msgid "Days before sending a second mail (0 to disable)"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:53
+msgid "Extension of the validity"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:53
+msgid "Extension of the duration of the account in days"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:58
+msgid "Sender email address"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:58
+msgid "Email address from which mails will be sent"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:65
+msgid "Alert email settings"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:68
+msgid "Forward alerts to the manager"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:73
+#: config/user-reminder/class_userReminderConfig.inc:99
+msgid "Subject"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:73
+msgid "Subject of the alert email"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:75
+msgid "[FusionDirectory] Your account is about to expire"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:78
+#, php-format
+msgid "Body (%s are cn, login, and link token)"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:79
+#, php-format
+msgid ""
+"Body of the alert email, sent when the user is about to expire. Use %s for "
+"the cn, uid and token."
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:81
+#, php-format
+msgid ""
+"Dear %1$s,\n"
+"your account %2$s is about to expire, please use this link to avoid this: \n"
+"https://"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:91
+msgid "Confirmation email settings"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:94
+msgid "Forward confirmation to the manager"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:94
+msgid "Forward account extension confirmation to the manager"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:99
+msgid "Subject of the confirmation email"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:101
+msgid "[FusionDirectory] Your account expiration has been postponed"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:104
+#, php-format
+msgid "Body (%s are cn and login)"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:105
+#, php-format
+msgid ""
+"Body of the confirmation email, sent when the user has postponed expiration."
+" Use %s for the cn and uid."
+msgstr ""
+
+#: 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 ""
+
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:191
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:200
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:203
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr ""
+
+#: ihtml/themes/breezy/user-reminder.tpl.c:2
+#: ihtml/themes/breezy/user-reminder.tpl.c:5
+msgid "User"
+msgstr ""
+
+#: ihtml/themes/breezy/user-reminder.tpl.c:8
+msgid "Expiration postpone"
+msgstr ""
+
+#: ihtml/themes/breezy/user-reminder.tpl.c:11
+#: ihtml/themes/breezy/user-reminder.tpl.c:14
+msgid "Success"
+msgstr ""
+
+#: ihtml/themes/breezy/user-reminder.tpl.c:17
+msgid "Your expiration has been postponed successfully."
+msgstr ""
+
+#: ihtml/themes/breezy/user-reminder.tpl.c:20
+#: ihtml/themes/breezy/user-reminder.tpl.c:23
+msgid "Error"
+msgstr ""
+
+#: ihtml/themes/breezy/user-reminder.tpl.c:26
+msgid "There was a problem"
+msgstr ""
diff --git a/user-reminder/locale/ar/fusiondirectory.po b/user-reminder/locale/ar/fusiondirectory.po
index 4e097c7f0a067b00039a1c63d167d445499f8bae..665fb6322a4758ce547ca4a7a002d9d42080d109 100644
--- a/user-reminder/locale/ar/fusiondirectory.po
+++ b/user-reminder/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
diff --git a/user-reminder/locale/ca/fusiondirectory.po b/user-reminder/locale/ca/fusiondirectory.po
index b437e3070b5280b5e962c76bbabfe074819f00c4..cc6c91b38988df2086c0cf75bd3e533ce26a55a2 100644
--- a/user-reminder/locale/ca/fusiondirectory.po
+++ b/user-reminder/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
diff --git a/user-reminder/locale/cs_CZ/fusiondirectory.po b/user-reminder/locale/cs_CZ/fusiondirectory.po
index ea7daece103f02e11e3f2434a755f3344ffaa274..b9dc593aaca01161cb50df776a244951c4ba56c5 100644
--- a/user-reminder/locale/cs_CZ/fusiondirectory.po
+++ b/user-reminder/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
diff --git a/user-reminder/locale/de/fusiondirectory.po b/user-reminder/locale/de/fusiondirectory.po
index da49ea5504db94391e917a7172d3d3c6274dfb6d..bb6ecdff8b47986a9492d23b22b72f642bac4878 100644
--- a/user-reminder/locale/de/fusiondirectory.po
+++ b/user-reminder/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/user-reminder/locale/el_GR/fusiondirectory.po b/user-reminder/locale/el_GR/fusiondirectory.po
index 8e5c73d60823fee5d02856f8817b3fa29d54b5bd..e817d59f9fd17f243f613031ab9b28bcdc1d2f84 100644
--- a/user-reminder/locale/el_GR/fusiondirectory.po
+++ b/user-reminder/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/user-reminder/locale/es/fusiondirectory.po b/user-reminder/locale/es/fusiondirectory.po
index 42f6d955450f8c875cb386adb75eb90be833a5df..fc5172fc8096239f4e12f0098d6358a39274504b 100644
--- a/user-reminder/locale/es/fusiondirectory.po
+++ b/user-reminder/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/user-reminder/locale/es_CO/fusiondirectory.po b/user-reminder/locale/es_CO/fusiondirectory.po
index 3b5e99ae0597c31cbd5ee018d2b7f598c1252013..92cbf1291a771a21675d971e445c9e54efb021f1 100644
--- a/user-reminder/locale/es_CO/fusiondirectory.po
+++ b/user-reminder/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/user-reminder/locale/es_VE/fusiondirectory.po b/user-reminder/locale/es_VE/fusiondirectory.po
index 5afbab8d4e104d898f82a0561c38887930c61814..73093eb805f3f906581474017ed09f02ea28c173 100644
--- a/user-reminder/locale/es_VE/fusiondirectory.po
+++ b/user-reminder/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/user-reminder/locale/fa_IR/fusiondirectory.po b/user-reminder/locale/fa_IR/fusiondirectory.po
index 592f97d61202eefa769c346a6a06068c1d61f643..c6b08acebb60792143eaa1d6fac7d1bc095ddd85 100644
--- a/user-reminder/locale/fa_IR/fusiondirectory.po
+++ b/user-reminder/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa_IR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
diff --git a/user-reminder/locale/fi_FI/fusiondirectory.po b/user-reminder/locale/fi_FI/fusiondirectory.po
index 75149810bcde49097caf047d3ffa39846b35be9a..5f6b52b8cf879317236eacdc957dbc43bd1dd683 100644
--- a/user-reminder/locale/fi_FI/fusiondirectory.po
+++ b/user-reminder/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/user-reminder/locale/fr/fusiondirectory.po b/user-reminder/locale/fr/fusiondirectory.po
index d56a323db812f02e5b9122334636a6a4bb6456d3..4d196d415e6b93a6b5726b9bf341e876f55e56da 100644
--- a/user-reminder/locale/fr/fusiondirectory.po
+++ b/user-reminder/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/user-reminder/locale/hu_HU/fusiondirectory.po b/user-reminder/locale/hu_HU/fusiondirectory.po
index cd8cf75fc5cfe9638f8b8bccdb6abdecd7734a48..1cdb775b4562604658e611aca5d31319953fa48e 100644
--- a/user-reminder/locale/hu_HU/fusiondirectory.po
+++ b/user-reminder/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/user-reminder/locale/id/fusiondirectory.po b/user-reminder/locale/id/fusiondirectory.po
index 9b7d818cef3d9c4b8a0087b41a7a1f31cfff236b..9e09de64140bb1f87d7ca68c359153c563d68285 100644
--- a/user-reminder/locale/id/fusiondirectory.po
+++ b/user-reminder/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/user-reminder/locale/it_IT/fusiondirectory.po b/user-reminder/locale/it_IT/fusiondirectory.po
index e6db6b4f982e8024fce2220f1540cd8f05400d60..5de3189b1336fb2eb21d1dffb5bd69cdbbb45b81 100644
--- a/user-reminder/locale/it_IT/fusiondirectory.po
+++ b/user-reminder/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/user-reminder/locale/ja/fusiondirectory.po b/user-reminder/locale/ja/fusiondirectory.po
index 6eeb37828f7fdff749dcfac5234c1fbb410ee833..c4e3ba74b1ce5176f19904d5499e693d0a8ec50c 100644
--- a/user-reminder/locale/ja/fusiondirectory.po
+++ b/user-reminder/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/user-reminder/locale/ko/fusiondirectory.po b/user-reminder/locale/ko/fusiondirectory.po
index 5a4939f83c6e3806ecc34af82b12b9a2f17174f4..e70552270641f2aee7ba2326364dc3e58157446e 100644
--- a/user-reminder/locale/ko/fusiondirectory.po
+++ b/user-reminder/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/user-reminder/locale/lv/fusiondirectory.po b/user-reminder/locale/lv/fusiondirectory.po
index 5ca0d8b6a003ab894d0f1a76815394349fae28c2..3f9864a05380394edb14fbaadd79d354e0c3c709 100644
--- a/user-reminder/locale/lv/fusiondirectory.po
+++ b/user-reminder/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
diff --git a/user-reminder/locale/nb/fusiondirectory.po b/user-reminder/locale/nb/fusiondirectory.po
index 4426db221d26118888a1726d9f563b80a906693b..3d4cc192dbfc25cbf301fef9025c668804140cfb 100644
--- a/user-reminder/locale/nb/fusiondirectory.po
+++ b/user-reminder/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
diff --git a/user-reminder/locale/nl/fusiondirectory.po b/user-reminder/locale/nl/fusiondirectory.po
index 56436b0f801bccc6bb5a7a99fb3ff1e11eb21730..7f0e7c6c15ded875282c6589a0cfea53dcd241f6 100644
--- a/user-reminder/locale/nl/fusiondirectory.po
+++ b/user-reminder/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/user-reminder/locale/pl/fusiondirectory.po b/user-reminder/locale/pl/fusiondirectory.po
index 8fdd336a116a007b8d613413c72e3a9d5df65b7b..f3e4b5d5af7db5102ca6b0ee9a4f1d08055ba04f 100644
--- a/user-reminder/locale/pl/fusiondirectory.po
+++ b/user-reminder/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/user-reminder/locale/pt/fusiondirectory.po b/user-reminder/locale/pt/fusiondirectory.po
index be3a1c787e61f8ab8e7efa3866c91ec6478f8e76..1df92d3f6f8e091da3660c0f49295d3eac942be3 100644
--- a/user-reminder/locale/pt/fusiondirectory.po
+++ b/user-reminder/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
diff --git a/user-reminder/locale/pt_BR/fusiondirectory.po b/user-reminder/locale/pt_BR/fusiondirectory.po
index 0897abb7415637c16adaafed812555e08d185b29..2d1c1758e7c68e2180b39aff6ac4b928d8247a5d 100644
--- a/user-reminder/locale/pt_BR/fusiondirectory.po
+++ b/user-reminder/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/user-reminder/locale/ru/fusiondirectory.po b/user-reminder/locale/ru/fusiondirectory.po
index 7ea96c57a9bc6540b6e990f0f6b31f3f536ef8a6..32d070e3c6063082c8ba7dfb8ff25aa82f9eaed9 100644
--- a/user-reminder/locale/ru/fusiondirectory.po
+++ b/user-reminder/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/user-reminder/locale/ru@petr1708/fusiondirectory.po b/user-reminder/locale/ru@petr1708/fusiondirectory.po
index 54a192877b6e75e3dfc97a7c7e01a276ecd1406b..568927e92bca953769442023e9520f2247f24d08 100644
--- a/user-reminder/locale/ru@petr1708/fusiondirectory.po
+++ b/user-reminder/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/user-reminder/locale/sv/fusiondirectory.po b/user-reminder/locale/sv/fusiondirectory.po
index f8bdc7aaa86498f756fc037f648178fe70883c2a..f6fd360b7c61f6ef1ce752de441603e9586db9c0 100644
--- a/user-reminder/locale/sv/fusiondirectory.po
+++ b/user-reminder/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/user-reminder/locale/tr_TR/fusiondirectory.po b/user-reminder/locale/tr_TR/fusiondirectory.po
index 622c2c9383f74b878efa185213f17eaa94f1ee44..2d5ca719bf07c9e9dca420d3e773c8daffee0007 100644
--- a/user-reminder/locale/tr_TR/fusiondirectory.po
+++ b/user-reminder/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/user-reminder/locale/ug/fusiondirectory.po b/user-reminder/locale/ug/fusiondirectory.po
index a541e79d58c6af3fd4f179a8b1d3abb37b1d1a8e..093f6a112f620dd0190e5ccc6ada4a924a0a350f 100644
--- a/user-reminder/locale/ug/fusiondirectory.po
+++ b/user-reminder/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/user-reminder/locale/vi_VN/fusiondirectory.po b/user-reminder/locale/vi_VN/fusiondirectory.po
index b7883836fa2b68ce7196df0dc1b1f94f0779c9b9..eb0e49b7f3e07dd2c2fca7715c438930a0dfdd70 100644
--- a/user-reminder/locale/vi_VN/fusiondirectory.po
+++ b/user-reminder/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
diff --git a/user-reminder/locale/zh/fusiondirectory.po b/user-reminder/locale/zh/fusiondirectory.po
index 733ea226a0798bfe810040fa26cf7d4d4c3f0722..6d9952d1670250d47057850c8a7730256527e131 100644
--- a/user-reminder/locale/zh/fusiondirectory.po
+++ b/user-reminder/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/user-reminder/locale/zh_TW/fusiondirectory.po b/user-reminder/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..af99903110d777b312b9593b8eaa05c11419488a
--- /dev/null
+++ b/user-reminder/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,187 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: config/user-reminder/class_userReminderConfig.inc:28
+msgid "User reminder"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:29
+msgid "Configuration for the reminder of accounts expiration"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:40
+msgid "User reminder settings"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:43
+msgid "Delay before expiration"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:43
+msgid "Days before expiration to send the first mail"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:48
+msgid "Delay before sending again"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:48
+msgid "Days before sending a second mail (0 to disable)"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:53
+msgid "Extension of the validity"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:53
+msgid "Extension of the duration of the account in days"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:58
+msgid "Sender email address"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:58
+msgid "Email address from which mails will be sent"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:65
+msgid "Alert email settings"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:68
+msgid "Forward alerts to the manager"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:73
+#: config/user-reminder/class_userReminderConfig.inc:99
+msgid "Subject"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:73
+msgid "Subject of the alert email"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:75
+msgid "[FusionDirectory] Your account is about to expire"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:78
+#, php-format
+msgid "Body (%s are cn, login, and link token)"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:79
+#, php-format
+msgid ""
+"Body of the alert email, sent when the user is about to expire. Use %s for "
+"the cn, uid and token."
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:81
+#, php-format
+msgid ""
+"Dear %1$s,\n"
+"your account %2$s is about to expire, please use this link to avoid this: \n"
+"https://"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:91
+msgid "Confirmation email settings"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:94
+msgid "Forward confirmation to the manager"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:94
+msgid "Forward account extension confirmation to the manager"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:99
+msgid "Subject of the confirmation email"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:101
+msgid "[FusionDirectory] Your account expiration has been postponed"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:104
+#, php-format
+msgid "Body (%s are cn and login)"
+msgstr ""
+
+#: config/user-reminder/class_userReminderConfig.inc:105
+#, php-format
+msgid ""
+"Body of the confirmation email, sent when the user has postponed expiration."
+" Use %s for the cn and uid."
+msgstr ""
+
+#: 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 ""
+
+#: html/class_expiredUserPostpone.inc:58
+msgid "This token is invalid"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:191
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:200
+#, php-format
+msgid "Did not find an account with login \"%s\""
+msgstr ""
+
+#: html/class_expiredUserPostpone.inc:203
+#, php-format
+msgid "Found multiple accounts with login \"%s\""
+msgstr ""
+
+#: ihtml/themes/breezy/user-reminder.tpl.c:2
+#: ihtml/themes/breezy/user-reminder.tpl.c:5
+msgid "User"
+msgstr ""
+
+#: ihtml/themes/breezy/user-reminder.tpl.c:8
+msgid "Expiration postpone"
+msgstr ""
+
+#: ihtml/themes/breezy/user-reminder.tpl.c:11
+#: ihtml/themes/breezy/user-reminder.tpl.c:14
+msgid "Success"
+msgstr ""
+
+#: ihtml/themes/breezy/user-reminder.tpl.c:17
+msgid "Your expiration has been postponed successfully."
+msgstr ""
+
+#: ihtml/themes/breezy/user-reminder.tpl.c:20
+#: ihtml/themes/breezy/user-reminder.tpl.c:23
+msgid "Error"
+msgstr ""
+
+#: ihtml/themes/breezy/user-reminder.tpl.c:26
+msgid "There was a problem"
+msgstr ""
diff --git a/weblink/locale/af_ZA/fusiondirectory.po b/weblink/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..26a2020c9d383046e966d8b73c40a53dd7393b8d
--- /dev/null
+++ b/weblink/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/systems/weblink/class_webLink.inc:31
+#: admin/systems/weblink/class_webLink.inc:44
+msgid "Web link"
+msgstr ""
+
+#: admin/systems/weblink/class_webLink.inc:32
+msgid "Edit web link"
+msgstr ""
+
+#: admin/systems/weblink/class_webLink.inc:47
+msgid "Protocol"
+msgstr ""
+
+#: admin/systems/weblink/class_webLink.inc:47
+msgid "Protocol to use to access this computer Web page"
+msgstr ""
+
+#: admin/systems/weblink/class_webLink.inc:52
+msgid "Links"
+msgstr ""
+
+#: admin/systems/weblink/class_webLink.inc:52
+msgid "Web links to this computer"
+msgstr ""
diff --git a/weblink/locale/ar/fusiondirectory.po b/weblink/locale/ar/fusiondirectory.po
index 231c30cbf04a06afadf0e39dea88927df263afb8..3d50df56a30a674b022d19893c7fa050af58f41c 100644
--- a/weblink/locale/ar/fusiondirectory.po
+++ b/weblink/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/ca/fusiondirectory.po b/weblink/locale/ca/fusiondirectory.po
index cea4ec2677566e8437346d199d4e38bed458df5a..22d0b82edef925b8d0f78dda58b7b663c8361293 100644
--- a/weblink/locale/ca/fusiondirectory.po
+++ b/weblink/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/cs_CZ/fusiondirectory.po b/weblink/locale/cs_CZ/fusiondirectory.po
index 8fe1f159f7e720a4efdaa2a7441e0121baa94b4f..524ba5c012ec1dc1c591ff1a0efede466f982a1c 100644
--- a/weblink/locale/cs_CZ/fusiondirectory.po
+++ b/weblink/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: admin/systems/weblink/class_webLink.inc:31
 #: admin/systems/weblink/class_webLink.inc:44
diff --git a/weblink/locale/de/fusiondirectory.po b/weblink/locale/de/fusiondirectory.po
index 36d6fa2359dc8f65cdbd3b6cf3a1674da0f4450d..7811aa700325d519ea6b9de0a8a83dce09638fa5 100644
--- a/weblink/locale/de/fusiondirectory.po
+++ b/weblink/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/weblink/locale/el_GR/fusiondirectory.po b/weblink/locale/el_GR/fusiondirectory.po
index 31cc7b370f5d3418389881a4437d9e11e995d0dc..3a6564f0b8148b24bf0b91f5bb697e8d568a4c16 100644
--- a/weblink/locale/el_GR/fusiondirectory.po
+++ b/weblink/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/weblink/locale/es/fusiondirectory.po b/weblink/locale/es/fusiondirectory.po
index dbcaea140d0e1108cf6475320c963238c058afc5..01402cca1058d9a58fa38a36dbb062d5bc154673 100644
--- a/weblink/locale/es/fusiondirectory.po
+++ b/weblink/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/es_CO/fusiondirectory.po b/weblink/locale/es_CO/fusiondirectory.po
index a3c5953cd713f20a2c523fff23245c76c78829bb..2ef3fa967cc54268a5362372f214d03dc449adb0 100644
--- a/weblink/locale/es_CO/fusiondirectory.po
+++ b/weblink/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/es_VE/fusiondirectory.po b/weblink/locale/es_VE/fusiondirectory.po
index 23aae02854082847a8db3e5ad50ba75ff1c82d62..d87d6248fee8a22786e94240ed6d89321dfb36f2 100644
--- a/weblink/locale/es_VE/fusiondirectory.po
+++ b/weblink/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/fa_IR/fusiondirectory.po b/weblink/locale/fa_IR/fusiondirectory.po
index 9b8e66519fc4f08a2be1d48e41e06508114e3113..8a00499af32c57a946b22eac463d0c941e1abdcf 100644
--- a/weblink/locale/fa_IR/fusiondirectory.po
+++ b/weblink/locale/fa_IR/fusiondirectory.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: admin/systems/weblink/class_webLink.inc:31
 #: admin/systems/weblink/class_webLink.inc:44
diff --git a/weblink/locale/fi_FI/fusiondirectory.po b/weblink/locale/fi_FI/fusiondirectory.po
index 76c7c63006316e399ba4672df11ff8ef1336db4c..5759c281b3a07ac110a7ed3c33c141c27f0148a1 100644
--- a/weblink/locale/fi_FI/fusiondirectory.po
+++ b/weblink/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
diff --git a/weblink/locale/fr/fusiondirectory.po b/weblink/locale/fr/fusiondirectory.po
index 411a241f19a8c9e173ea29c8ee774f5f5dd565d3..be7be91f3e8a6ec66422a05723fa621dc91d82c0 100644
--- a/weblink/locale/fr/fusiondirectory.po
+++ b/weblink/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
diff --git a/weblink/locale/hu_HU/fusiondirectory.po b/weblink/locale/hu_HU/fusiondirectory.po
index b3a4566f0c14df986491060a29177cfc9b0ec24a..34ef977de288b128eb166c3484d641ff88cc4796 100644
--- a/weblink/locale/hu_HU/fusiondirectory.po
+++ b/weblink/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/id/fusiondirectory.po b/weblink/locale/id/fusiondirectory.po
index 048664e0edbd8c8913730e1a7f66caf99f00f3b9..cffd166a986fc4f5279d0bf582071bdcb2b9f578 100644
--- a/weblink/locale/id/fusiondirectory.po
+++ b/weblink/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/it_IT/fusiondirectory.po b/weblink/locale/it_IT/fusiondirectory.po
index 8cf2bc728f5edd13d61f1506cf7426bde21f8bb8..0c121a3980a730f697210a5e14873ef50ab0eb71 100644
--- a/weblink/locale/it_IT/fusiondirectory.po
+++ b/weblink/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
diff --git a/weblink/locale/ja/fusiondirectory.po b/weblink/locale/ja/fusiondirectory.po
index 833a989602910da18b0cc89d261622ce03b94c8f..5585f64358aeeff4bc73cf2d0bee1d648e9eabda 100644
--- a/weblink/locale/ja/fusiondirectory.po
+++ b/weblink/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/ko/fusiondirectory.po b/weblink/locale/ko/fusiondirectory.po
index 417700ffb1516b0bfe3e908bd6d1639071549f64..ee00e51297f2fea552179fff4e55873ef7ed1945 100644
--- a/weblink/locale/ko/fusiondirectory.po
+++ b/weblink/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
diff --git a/weblink/locale/lv/fusiondirectory.po b/weblink/locale/lv/fusiondirectory.po
index 98794972b5fd921b6e35d14dba861dc351161f9f..cab69af54a6ac2a1c71695c9ce6deff60f4c6a1b 100644
--- a/weblink/locale/lv/fusiondirectory.po
+++ b/weblink/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/nb/fusiondirectory.po b/weblink/locale/nb/fusiondirectory.po
index 5c251c4490df4350e1e338ff0efa2f4114e4dbee..65e964f4a03909ad465e3c047b1684314fb5eda7 100644
--- a/weblink/locale/nb/fusiondirectory.po
+++ b/weblink/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/nl/fusiondirectory.po b/weblink/locale/nl/fusiondirectory.po
index 827cf7f46502aadcf4a2f8ea1bdf184c64d3763b..51968765668f6a89ef7d72cd420a7af0cf4c1657 100644
--- a/weblink/locale/nl/fusiondirectory.po
+++ b/weblink/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
diff --git a/weblink/locale/pl/fusiondirectory.po b/weblink/locale/pl/fusiondirectory.po
index 9a2ce31c8ae50e6bc22ef42c6b1c97331b9618d4..2fb30713cc127121364801ff932a78be1cb0527c 100644
--- a/weblink/locale/pl/fusiondirectory.po
+++ b/weblink/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/weblink/locale/pt/fusiondirectory.po b/weblink/locale/pt/fusiondirectory.po
index f3a459c9145eb14868c14cd3020f0a3520a97719..c2568811d4d7e6069fe77eec4398bbdb3c109479 100644
--- a/weblink/locale/pt/fusiondirectory.po
+++ b/weblink/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/pt_BR/fusiondirectory.po b/weblink/locale/pt_BR/fusiondirectory.po
index 59fc662f1aa6daf3b4dcced4a0204118af825231..aced10a2b257803673d9f55ac464f145ecd6e196 100644
--- a/weblink/locale/pt_BR/fusiondirectory.po
+++ b/weblink/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/weblink/locale/ru/fusiondirectory.po b/weblink/locale/ru/fusiondirectory.po
index 34f64fe58c3e9503753ff12934faff64ad49c9c2..8db0324cddefe6b7f0bf8c2799f8ae45c9799973 100644
--- a/weblink/locale/ru/fusiondirectory.po
+++ b/weblink/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
diff --git a/weblink/locale/ru@petr1708/fusiondirectory.po b/weblink/locale/ru@petr1708/fusiondirectory.po
index 6288a9c1e24c7bfb304672ba3f30b3dc8a87832f..b0ddc8041bb0d70d9c9dcf8484cd51c21ed4a869 100644
--- a/weblink/locale/ru@petr1708/fusiondirectory.po
+++ b/weblink/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/sv/fusiondirectory.po b/weblink/locale/sv/fusiondirectory.po
index ac6ecf78ef4590ba90cf2386149e9f044c77c074..e84671b6e5fc420331aafa901a25a12c4028113e 100644
--- a/weblink/locale/sv/fusiondirectory.po
+++ b/weblink/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/tr_TR/fusiondirectory.po b/weblink/locale/tr_TR/fusiondirectory.po
index 286db6956ed7f19f4eb4fce0043103fa694454b9..003a7a56442b362ae579ca792f1572a97397cbe8 100644
--- a/weblink/locale/tr_TR/fusiondirectory.po
+++ b/weblink/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/ug/fusiondirectory.po b/weblink/locale/ug/fusiondirectory.po
index f55ffe23263a127791cb0dffb67e0dcae151351b..b99faade78bc126be3069c305c01476f64634cf5 100644
--- a/weblink/locale/ug/fusiondirectory.po
+++ b/weblink/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/vi_VN/fusiondirectory.po b/weblink/locale/vi_VN/fusiondirectory.po
index d7e73ab3bce61ee536bf952886e7a54abc4cd43f..a6f7f6442bc2d06e58955a5d2de123822a37f862 100644
--- a/weblink/locale/vi_VN/fusiondirectory.po
+++ b/weblink/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/zh/fusiondirectory.po b/weblink/locale/zh/fusiondirectory.po
index e78c557178b442415a5975ed7c06fc40cd49f238..31571d085d1ed0a517927b57a6bea8bd09fba6d0 100644
--- a/weblink/locale/zh/fusiondirectory.po
+++ b/weblink/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
diff --git a/weblink/locale/zh_TW/fusiondirectory.po b/weblink/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..622d3037dbd675e99608a95bb0bf7db94ff6e34b
--- /dev/null
+++ b/weblink/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/systems/weblink/class_webLink.inc:31
+#: admin/systems/weblink/class_webLink.inc:44
+msgid "Web link"
+msgstr ""
+
+#: admin/systems/weblink/class_webLink.inc:32
+msgid "Edit web link"
+msgstr ""
+
+#: admin/systems/weblink/class_webLink.inc:47
+msgid "Protocol"
+msgstr ""
+
+#: admin/systems/weblink/class_webLink.inc:47
+msgid "Protocol to use to access this computer Web page"
+msgstr ""
+
+#: admin/systems/weblink/class_webLink.inc:52
+msgid "Links"
+msgstr ""
+
+#: admin/systems/weblink/class_webLink.inc:52
+msgid "Web links to this computer"
+msgstr ""
diff --git a/webservice/html/jsonrpc.php b/webservice/html/jsonrpc.php
index 51b0f3840b87db8fc82ccf27d33f1c5beefd66b8..ed94c14ebbce4f70e6d2f287b3157b11b55f41fb 100644
--- a/webservice/html/jsonrpc.php
+++ b/webservice/html/jsonrpc.php
@@ -26,6 +26,9 @@
  * Then the url of the webservice will be the url of your FusionDirectory instance followed by /jsonrpc.php
  */
 
+ini_set('session.use_cookies', 0);
+ini_set('session.use_only_cookies', 1);
+
 function authenticateHeader($message = 'Authentication required')
 {
   header('WWW-Authenticate: Basic realm="FusionDirectory"');
diff --git a/webservice/locale/af_ZA/fusiondirectory.po b/webservice/locale/af_ZA/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..e3c9b8d767fb26fbd701d3f89657ab6967cf3ae5
--- /dev/null
+++ b/webservice/locale/af_ZA/fusiondirectory.po
@@ -0,0 +1,86 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: af_ZA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: config/class_webserviceConfig.inc:28
+msgid "Webservice configuration"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:29
+msgid "FusionDirectory webservice plugin configuration"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:42
+msgid "Webservice"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:45
+msgid "Force SSL"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:45
+msgid "Allow only HTTPS JSON-RPC requests"
+msgstr ""
+
+#: html/jsonrpc.php:55
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr ""
+
+#: html/jsonrpc.php:65
+#, php-format
+msgid "Cannot locate file '%s' - please run '%s' to fix this"
+msgstr ""
+
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
+msgid "Plugin"
+msgstr ""
+
+#: html/jsonrpc.php:520
+#, php-format
+msgid "Cannot delete %s. It has been locked by %s."
+msgstr ""
+
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
+#, php-format
+msgid "Failed to get password method for account \"%s\". It has not been locked!"
+msgstr ""
+
+#: html/jsonrpc.php:592
+#, php-format
+msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
+msgstr ""
+
+#: html/jsonrpc.php:599
+#, php-format
+msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
+msgstr ""
+
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
+#, php-format
+msgid "Failed to get password method for account \"%s\""
+msgstr ""
+
+#: html/jsonrpc.php:649
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr ""
+
+#: html/jsonrpc.php:693
+msgid "This token is invalid"
+msgstr ""
diff --git a/webservice/locale/ar/fusiondirectory.po b/webservice/locale/ar/fusiondirectory.po
index 2cd34369790975ffb76ab72501e708e79a67c5fb..156be45cac7d9b826bcd9d282a336ba028e0ceab 100644
--- a/webservice/locale/ar/fusiondirectory.po
+++ b/webservice/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -37,50 +37,50 @@ msgstr ""
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr ""
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/ca/fusiondirectory.po b/webservice/locale/ca/fusiondirectory.po
index ab38fb818f143ec72411871e633e6e525893fcf8..07f764ac7117e808ebd09fa60e6da10c4cf7c572 100644
--- a/webservice/locale/ca/fusiondirectory.po
+++ b/webservice/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -38,51 +38,51 @@ msgstr ""
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr ""
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 "La configuració %s/%s del FusionDirectori no és llegible. S'està avortant."
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr "Connector"
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/cs_CZ/fusiondirectory.po b/webservice/locale/cs_CZ/fusiondirectory.po
index 62854d09c50f0ae7aaee58aebdefb2aee2576d1c..1791492a7cd8a60e6620797acc5baed87b0e16ce 100644
--- a/webservice/locale/cs_CZ/fusiondirectory.po
+++ b/webservice/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -16,7 +16,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: config/class_webserviceConfig.inc:28
 msgid "Webservice configuration"
@@ -38,55 +38,55 @@ msgstr "Vynutit SSL"
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr "Přijímat JSON-RPC požadavky pouze přes HTTPS"
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "Nastavení %s/%s FusionDirectory není čitelné. Akce byla zrušena."
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Nemohu nalézt soubor '%s' – opravte to prosím spuštěním '%s' (na serveru)."
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr "zásuvný modul"
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr "%s nelze smazat. Je uzamčeno %s."
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 "Nepodařilo se zjistit jaká metoda je používána pro heslo u účtu „%s“. Nebyl "
 "proto uzamčen!"
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 "S metodou ukládání hesla „%s“ se zamykání nezdařilo. Účet „%s“ nebyl "
 "uzamčen!"
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr "Účet „%s“ se nepodařilo v LDAP najít. Nebyl proto uzamčen!"
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr "Nepodařilo se získat metodu hesla pro účet „%s“"
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr "Účet „%s“ se nepodařilo najít v LDAP."
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 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 e5637b236576af6722c123fcd6827fa7db0087b9..74fa29b39c033c015ff3b46c6d77963b90d14631 100644
--- a/webservice/locale/de/fusiondirectory.po
+++ b/webservice/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -38,52 +38,52 @@ msgstr "SSL erzwingen"
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr "Nur HTTPS JSON-RPC-Anfragen erlauben"
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "FusionDirectory Konfiguration %s/%s ist nicht lesbar. Abgebrochen."
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, 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"
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr "Erweiterung"
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 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 fdbcfcba19e6dddb8d7d2a5739f00626d495cf41..3823f1f9a3ee72791bd24cd7caf1e969fd5289e0 100644
--- a/webservice/locale/el_GR/fusiondirectory.po
+++ b/webservice/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -38,53 +38,53 @@ msgstr "Εξαναγκασμός SSL"
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr "Να επιτρέπονται μόνο αιτήσεις HTTPS JSON-RPC"
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 "Οι ρυθμίσεις %s/%s  του FusionDirectory δεν είναι αναγνώσιμες. Εγκατάλειψη"
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Αδυναμία εντοπισμού αρχείου '%s' - παρακαλώ εκτελέστε το '%s' για να το "
 "διορθώσετε"
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr "Πρόσθετο"
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr "Αδυναμία διαγραφής %s. Έχει κλειδωθεί από το  %s."
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/es/fusiondirectory.po b/webservice/locale/es/fusiondirectory.po
index 957281577edae494cae8911833c576571be754f4..df5728e853409eb9a83f241f4ed867985dda0b7b 100644
--- a/webservice/locale/es/fusiondirectory.po
+++ b/webservice/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -38,53 +38,53 @@ msgstr ""
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr ""
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 "La configuración de FusionDirectory %s/%s no se puede leer. Cancelado."
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, 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"
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr "Extensión"
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 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 e753e8c2658f1f9cf5ec13109c0bd6dbf5e405fe..b2220e4e63f79759d6188cc2f222f3b7d3c3cf6f 100644
--- a/webservice/locale/es_CO/fusiondirectory.po
+++ b/webservice/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -38,54 +38,54 @@ msgstr ""
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr ""
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, 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."
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, 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."
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 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 44d0a9c51304f2fd4ccb2da8af061ba1a719267f..ae2e6185c4ec10b2314875a5964fb77872376dd6 100644
--- a/webservice/locale/es_VE/fusiondirectory.po
+++ b/webservice/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -38,53 +38,53 @@ msgstr ""
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr ""
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 "La configuración de FusionDirectory %s/%s no se puede leer. Cancelado."
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, 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"
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr "Extensión"
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 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 76172171d0e6e5402e310ec32ece213ee4d2144b..1f23b6bdea810f1bf42025840d121316d7d17214 100644
--- a/webservice/locale/fa_IR/fusiondirectory.po
+++ b/webservice/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa_IR\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: config/class_webserviceConfig.inc:28
 msgid "Webservice configuration"
@@ -38,50 +38,50 @@ msgstr ""
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr ""
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr "فایل '%s' را نمی توانم پیدا کنم برای رفع مشکل دستور '%s' را بزنید."
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr "پلاگین"
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/fi_FI/fusiondirectory.po b/webservice/locale/fi_FI/fusiondirectory.po
index d860d260913b107af6f8d1f42fb5e2abe27525c1..62558beb2f56648eb97796b0871c4ae6b83c6230 100644
--- a/webservice/locale/fi_FI/fusiondirectory.po
+++ b/webservice/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -37,50 +37,50 @@ msgstr ""
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr ""
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/fr/fusiondirectory.po b/webservice/locale/fr/fusiondirectory.po
index b3305bf5f38491205fe3bb76630ba3acef80f565..bb2ddfd40a822f3a9e815a70f7d03ca6fcefbdc4 100644
--- a/webservice/locale/fr/fusiondirectory.po
+++ b/webservice/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
@@ -38,60 +38,60 @@ msgstr "Forcer le SSL"
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr "Ne permettre que les connexions JSON-RPC en HTTPS"
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, 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."
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Le fichier '%s' n’a pas été trouvé - veuillez exécuter '%s' pour régler ce "
 "problème"
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr "Impossible de supprimer %s. Il a été verrouillé par %s."
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, 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é !"
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 "La méthode de mot de passe \"%s\" a échoué. Le compte \"%s\" n'a pas été "
 "verrouillé !"
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 "Impossible de trouver le compte \"%s\" dans le LDAP. Il n'a pas été "
 "verrouillé !"
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, 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:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr "Impossible de trouver le compte \"%s\" dans le LDAP"
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 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 2a3bea0876a72b420c6ccf76ed91d6693e6b24df..02435a5f38dae8991141c31b6a787d0f68223eb8 100644
--- a/webservice/locale/hu_HU/fusiondirectory.po
+++ b/webservice/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -37,50 +37,50 @@ msgstr ""
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr ""
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/id/fusiondirectory.po b/webservice/locale/id/fusiondirectory.po
index a12a01f03e157bce4355c050e171d795f7b6b17f..c5b4b7544ec89f05d5d849b9d8a23cf24261a685 100644
--- a/webservice/locale/id/fusiondirectory.po
+++ b/webservice/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -37,50 +37,50 @@ msgstr ""
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr ""
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/it_IT/fusiondirectory.po b/webservice/locale/it_IT/fusiondirectory.po
index d00ba5042df777f294afec3484edeba82dc4cb90..bfa109988f89ed9ef57b964233154a7b0102c541 100644
--- a/webservice/locale/it_IT/fusiondirectory.po
+++ b/webservice/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
@@ -38,56 +38,56 @@ msgstr "Forza l'SSL"
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr "Permetti soltanto richieste HTTPS JSON-RPC "
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 "Il file di configurazione %s/%s non è leggibile. Operazione Annullata."
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, 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"
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr "Estensione"
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, 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:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 "Impossibile ottenere metodo di password per l'account\"%s\". Non è stato "
 "bloccato!"
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 "Il metodo di bloccaggio \"%s\" é fallito. L'account \"%s\" non é stato "
 "bloccato!"
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, 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:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr "Impossibile ottenere metodo di password per l'account \"%s\". "
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr "Impossibile trovare  l'account \"%s\" nell'annuario LDAP"
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 msgid "This token is invalid"
 msgstr "Questo token non è valido"
diff --git a/webservice/locale/ja/fusiondirectory.po b/webservice/locale/ja/fusiondirectory.po
index 1653eafeadaed74e71fe30e02fda7a3fdc408f95..4563242e902316d340c93b18f36a5890ae9925e3 100644
--- a/webservice/locale/ja/fusiondirectory.po
+++ b/webservice/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -37,50 +37,50 @@ msgstr ""
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr ""
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/ko/fusiondirectory.po b/webservice/locale/ko/fusiondirectory.po
index 3cf6c64b52a800cdecdb6b2d771ed50f26888d88..c5df46f8a8df61f055748d135d5b157ce56aed56 100644
--- a/webservice/locale/ko/fusiondirectory.po
+++ b/webservice/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
@@ -38,50 +38,50 @@ msgstr "강제 SSL"
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr "HTTPS JSON-RPC 요청만 허용"
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "FustionDirection 설정 %s/%s 을 읽을 수 없습니다. 중단됨."
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr "'%s' 파일을 사용할 수 없습니다.  '%s' 를 실행해 주세요."
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr "플러그인"
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr "'%s'를 지울 수 없습니다. %s에 의해 잠겨있습니다."
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr "\"%s\" 계정의 패스워드를 가져올 수 없습니다. 잠겨있지 않습니다."
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr "\"%s\"의 패스워드를 잠글 수 없습니다. \"%s\" 계정이 잠겨있지 않습니다."
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr "LDAP에서 계정 \"%s\"을 찾을 수 없습니다. 잠겨있지 않습니다."
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr "\"%s\" 계정의 패스워드를 가져올 수 없습니다. "
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr "LDAP에서 계정 \"%s\"를 찾을 수 없습니다."
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 msgid "This token is invalid"
 msgstr "토큰이 유효하지 않습니다."
diff --git a/webservice/locale/lv/fusiondirectory.po b/webservice/locale/lv/fusiondirectory.po
index b9c5b2585524e29a012f97dd631983dfa1a1c2d0..bc4013e8e8b68f8ab47ebef39b4df05383ce3d9d 100644
--- a/webservice/locale/lv/fusiondirectory.po
+++ b/webservice/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -37,50 +37,50 @@ msgstr ""
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr ""
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/nb/fusiondirectory.po b/webservice/locale/nb/fusiondirectory.po
index fbc61d07c542a772899e2beef99c8dec20edc312..d07087574bf292d06a12e4679352ce4ac904c11f 100644
--- a/webservice/locale/nb/fusiondirectory.po
+++ b/webservice/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -37,50 +37,50 @@ msgstr ""
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr ""
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/nl/fusiondirectory.po b/webservice/locale/nl/fusiondirectory.po
index 851b7c8202ba59d0c793fd8da712502ade91140f..7b1fb7e5bab06cbb17c6d0b85ddb8f03e746e5c3 100644
--- a/webservice/locale/nl/fusiondirectory.po
+++ b/webservice/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
@@ -38,55 +38,55 @@ msgstr "SSL afdwingen"
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr "Laat enkel HTTPS JSON-RPC-aanvragen toe"
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "FusionDirectory configuratie %s/%s is niet leesbaar. Afgebroken."
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Kan bestand '%s' niet vinden. Gelieve '%s' uit te voeren om dit op te lossen"
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr "Kan %s niet verwijderen. Het is vergrendeld door %s."
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 "Kan de wachtwoordmethode niet opvragen voor account \"%s\". Het is niet "
 "vergrendeld!"
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 "Wachtwoordmethode \"%s\" kon niet vergrendelen. Account \"%s\" is niet "
 "vergrendeld!"
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr "Account \"%s\" kon niet gevonden worden in LDAP. Het is niet vergrendeld."
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr "Kan de wachtwoord methode niet opvragen voor account \"%s\"."
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr "Account \"%s\" kon niet gevonden worden in LDAP"
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 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 e7e2dfb050e27e97d8b617cbc83441a217e5dbb9..8f477d80fa22b9aa4e180ed2fd718b8ee81a77cc 100644
--- a/webservice/locale/pl/fusiondirectory.po
+++ b/webservice/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -38,50 +38,50 @@ msgstr ""
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr ""
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr "Dodatek"
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/pt/fusiondirectory.po b/webservice/locale/pt/fusiondirectory.po
index 8ab56c37f329c8437fa4cf137b9ec83c6a94dabb..6f644bec9e4c4bc086b2224b3ea1b8859face112 100644
--- a/webservice/locale/pt/fusiondirectory.po
+++ b/webservice/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -37,50 +37,50 @@ msgstr ""
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr ""
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/pt_BR/fusiondirectory.po b/webservice/locale/pt_BR/fusiondirectory.po
index bd6ed18c90cc56be9905f2a510b87df643349951..b1c74260d2a6aca576adf73a6c3c735fe5ea4b96 100644
--- a/webservice/locale/pt_BR/fusiondirectory.po
+++ b/webservice/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -38,52 +38,52 @@ msgstr ""
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr ""
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, 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."
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, 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"
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/ru/fusiondirectory.po b/webservice/locale/ru/fusiondirectory.po
index 4a249d1f6194edca385dcbe62f0df84eb9292c3d..c7cce575c29ebcbc6f03faee0aa1c3127066d1e3 100644
--- a/webservice/locale/ru/fusiondirectory.po
+++ b/webservice/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -38,52 +38,52 @@ msgstr ""
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr ""
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "Конфигурация FusionDirectory %s/%s не читаема. Прервано."
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Не могу обнаружить файл '%s' - пожалуйста запустите '%s', чтобы исправить "
 "это."
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr "Плагин"
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/ru@petr1708/fusiondirectory.po b/webservice/locale/ru@petr1708/fusiondirectory.po
index cfd39e43a665b19dab652857be7e145864451257..65c165c1b8214564ab9c1a7cefd6b60decb4ab7a 100644
--- a/webservice/locale/ru@petr1708/fusiondirectory.po
+++ b/webservice/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -37,50 +37,50 @@ msgstr ""
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr ""
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/sv/fusiondirectory.po b/webservice/locale/sv/fusiondirectory.po
index 63321427aff9a86e12cf7474886683881d62acfe..c4e2d890630914dbd0f17f0a73de04549889615c 100644
--- a/webservice/locale/sv/fusiondirectory.po
+++ b/webservice/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -38,51 +38,51 @@ msgstr ""
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr ""
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "FusionDirectory-konfiguration %s/%s är inte läsbar. Avbryter."
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, 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"
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/tr_TR/fusiondirectory.po b/webservice/locale/tr_TR/fusiondirectory.po
index 3f5f25a00a6cc330c610bb094268fe9f4cc252f1..583b995cc88be0b854890fd2737e07d7eb536079 100644
--- a/webservice/locale/tr_TR/fusiondirectory.po
+++ b/webservice/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
@@ -37,50 +37,50 @@ msgstr ""
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr ""
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/ug/fusiondirectory.po b/webservice/locale/ug/fusiondirectory.po
index 5361c3c2d08648d8355eb3313179b2d323cd3ac5..b54d3a917cf1483c4be0ee638b4b74e0662b9e25 100644
--- a/webservice/locale/ug/fusiondirectory.po
+++ b/webservice/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -37,50 +37,50 @@ msgstr ""
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr ""
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/vi_VN/fusiondirectory.po b/webservice/locale/vi_VN/fusiondirectory.po
index f10ebe9332b4a6873c713639b405e1c0c1c8d52b..f998c123d7b331fa8999953a6f23a2ffee0ec13f 100644
--- a/webservice/locale/vi_VN/fusiondirectory.po
+++ b/webservice/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -38,51 +38,51 @@ msgstr ""
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr ""
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, 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!"
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/zh/fusiondirectory.po b/webservice/locale/zh/fusiondirectory.po
index 87b481431b0d2bad01991147469f14395824a372..6577e5cc7c8d218ca695780dc0b2c53511412ba4 100644
--- a/webservice/locale/zh/fusiondirectory.po
+++ b/webservice/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-04-19 19:51+0000\n"
+"POT-Creation-Date: 2018-08-07 08:41+0000\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"
@@ -37,50 +37,50 @@ msgstr ""
 msgid "Allow only HTTPS JSON-RPC requests"
 msgstr ""
 
-#: html/jsonrpc.php:52
+#: html/jsonrpc.php:55
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/jsonrpc.php:62
+#: html/jsonrpc.php:65
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:338 html/jsonrpc.php:421
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:517
+#: html/jsonrpc.php:520
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:564 html/jsonrpc.php:593
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:589
+#: html/jsonrpc.php:592
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:596
+#: html/jsonrpc.php:599
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:634 html/jsonrpc.php:643
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:646
+#: html/jsonrpc.php:649
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:690
+#: html/jsonrpc.php:693
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/zh_TW/fusiondirectory.po b/webservice/locale/zh_TW/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..81013273b1c258f04c82665a331e1e2c72cf414a
--- /dev/null
+++ b/webservice/locale/zh_TW/fusiondirectory.po
@@ -0,0 +1,86 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the FusionDirectory 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: 2018-08-07 08:41+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: config/class_webserviceConfig.inc:28
+msgid "Webservice configuration"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:29
+msgid "FusionDirectory webservice plugin configuration"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:42
+msgid "Webservice"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:45
+msgid "Force SSL"
+msgstr ""
+
+#: config/class_webserviceConfig.inc:45
+msgid "Allow only HTTPS JSON-RPC requests"
+msgstr ""
+
+#: html/jsonrpc.php:55
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr ""
+
+#: html/jsonrpc.php:65
+#, php-format
+msgid "Cannot locate file '%s' - please run '%s' to fix this"
+msgstr ""
+
+#: html/jsonrpc.php:341 html/jsonrpc.php:424
+msgid "Plugin"
+msgstr ""
+
+#: html/jsonrpc.php:520
+#, php-format
+msgid "Cannot delete %s. It has been locked by %s."
+msgstr ""
+
+#: html/jsonrpc.php:567 html/jsonrpc.php:596
+#, php-format
+msgid "Failed to get password method for account \"%s\". It has not been locked!"
+msgstr ""
+
+#: html/jsonrpc.php:592
+#, php-format
+msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
+msgstr ""
+
+#: html/jsonrpc.php:599
+#, php-format
+msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
+msgstr ""
+
+#: html/jsonrpc.php:637 html/jsonrpc.php:646
+#, php-format
+msgid "Failed to get password method for account \"%s\""
+msgstr ""
+
+#: html/jsonrpc.php:649
+#, php-format
+msgid "Could not find account \"%s\" in LDAP"
+msgstr ""
+
+#: html/jsonrpc.php:693
+msgid "This token is invalid"
+msgstr ""